Chromecast: don't try to upload crash immediately.

chromecast/chromecast.gyp

 # Copyright 2014 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': {
     'android_support_v13_target%':
         '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
     'cast_build_release': 'internal/build/cast_build_release',
     'cast_is_debug_build%': 0,
@@ skipping 436 matching lines @@
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gl/gl.gyp:gl',
           ],
           'include_dirs': [
             '../breakpad/src',
           ],
           'sources': [
             'base/cast_sys_info_android.cc',
             'base/cast_sys_info_android.h',
+            'base/chromecast_config_android.cc',
+            'base/chromecast_config_android.h',
             'android/cast_jni_registrar.cc',
             'android/cast_jni_registrar.h',
             'android/cast_metrics_helper_android.cc',
             'android/cast_metrics_helper_android.h',
-            'android/chromecast_config_android.cc',
-            'android/chromecast_config_android.h',
             'android/platform_jni_loader.h',
             'app/android/cast_jni_loader.cc',
             'browser/android/cast_window_android.cc',
             'browser/android/cast_window_android.h',
             'browser/android/cast_window_manager.cc',
             'browser/android/cast_window_manager.h',
             'crash/android/cast_crash_reporter_client_android.cc',
             'crash/android/cast_crash_reporter_client_android.h',
             'crash/android/crash_handler.cc',
             'crash/android/crash_handler.h',
           ],
           'conditions': [
             ['chromecast_branding=="Chrome"', {
               'dependencies': [
                 'internal/chromecast_internal.gyp:cast_shell_android_internal'
               ],
             }, {
               'sources': [
-                'android/chromecast_config_android_stub.cc',
                 'android/platform_jni_loader_stub.cc',
               ],
             }]
           ],
         },  # end of target 'libcast_shell_android'
         {
+          'target_name': 'cast_base_java',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_java',
+          ],
+          'variables': {
+            'java_in_dir': 'base/java',
+          },
+          'includes': ['../build/java.gypi'],
+        },  # end of target 'cast_base_java'
+        {
           'target_name': 'cast_shell_java',
           'type': 'none',
           'dependencies': [
             '<(android_support_v13_target)',
+            'cast_base_java',
             '../base/base.gyp:base_java',
             '../components/components.gyp:external_video_surface_java',
             '../content/content.gyp:content_java',
             '../media/media.gyp:media_java',
             '../net/net.gyp:net_java',
             '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
             'has_java_resources': 1,
             'java_in_dir': 'browser/android/apk',
@@ skipping 33 matching lines @@
             'native_lib_target': 'libcast_shell_android',
             'asset_location': '<(PRODUCT_DIR)/assets',
             'additional_input_paths': ['<(PRODUCT_DIR)/assets/cast_shell.pak'],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cast_jni_headers',
           'type': 'none',
           'sources': [
+            'base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/chromecast',
             ],
@@ skipping 98 matching lines @@
           'sources': [
             'graphics/cast_egl_platform_default.cc',
             'graphics/graphics_properties_default.cc',
             'graphics/osd_plane_default.cc'
           ],
         }
       ]
     }],
   ],  # end of conditions
 }