Upstream crash changes for android.

base/base.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 104 matching lines @@
       ],
     },
     {
       'target_name': 'base_jni_headers',
       'type': 'none',
       'actions': [
         {
           'action_name': 'generate_jni_headers',
           'inputs': [
             'android/jni_generator/jni_generator.py',
+            'android/java/org/chromium/base/BuildInfo.java',
             'android/java/org/chromium/base/PathUtils.java',
             'android/java/org/chromium/base/SystemMessageHandler.java',
           ],
           'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/base/jni/build_info_jni.h',
             '<(SHARED_INTERMEDIATE_DIR)/base/jni/path_utils_jni.h',
             '<(SHARED_INTERMEDIATE_DIR)/base/jni/system_message_handler_jni.h',
           ],
           'action': [
             'python',
             'android/jni_generator/jni_generator.py',
             '-o',
             '<@(_inputs)',
             '<@(_outputs)',
           ],
@@ skipping 517 matching lines @@
              # treated as weak imports in dependents, who still must
              # #include closure_blocks_leopard_compat.h to get weak imports.
              'type': 'none',
            }],
          ],
        },
      ],
    }],
   ],
 }