Chromecast: make GYP targets more common between Android/Chromecast.Makes cast_crash_client common a

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',
     'chromium_code': 1,
@@ skipping 27 matching lines @@
       ],
       'sources': [
         'base/metrics/cast_histograms.h',
         'base/metrics/cast_metrics_helper.cc',
         'base/metrics/cast_metrics_helper.h',
         'base/metrics/grouped_histogram.cc',
         'base/metrics/grouped_histogram.h'
       ],
     },  # end of target 'cast_base'
     {
+      'target_name': 'cast_crash_client',
+      'type': '<(component)',
+      'dependencies': [
+        '../breakpad/breakpad.gyp:breakpad_client',
+        '../components/components.gyp:crash_component',
+      ],
+      'sources': [
+        'crash/cast_crash_reporter_client.cc',
+        'crash/cast_crash_reporter_client.h',
+      ],
+      'conditions': [
+        ['chromecast_branding=="Chrome"', {
+          'dependencies': [
+            '<(cast_internal_gyp):crash_internal',
+          ],
+        }, {
+          'sources': [
+            'crash/cast_crash_reporter_client_simple.cc',
+          ],
+        }],
+      ]
+    },  # end of target 'cast_crash_client'
+    {
       'target_name': 'cast_net',
       'type': '<(component)',
       'sources': [
         'net/network_change_notifier_cast.cc',
         'net/network_change_notifier_cast.h',
         'net/network_change_notifier_factory_cast.cc',
         'net/network_change_notifier_factory_cast.h',
       ],
     },
     {
@@ skipping 48 matching lines @@
         },
       ],
     },
     # This target contains all content-embedder implementation that is
     # non-platform-specific.
     {
       'target_name': 'cast_shell_common',
       'type': '<(component)',
       'dependencies': [
         'cast_base',
+        'cast_crash_client',
         'cast_shell_pak',
         'cast_shell_resources',
         'cast_version_header',
         'chromecast_locales.gyp:chromecast_locales_pak',
         'chromecast_locales.gyp:chromecast_settings',
         'media/media.gyp:media_base',
         '../base/base.gyp:base',
         '../components/components.gyp:breakpad_host',
         '../components/components.gyp:cdm_renderer',
         '../components/components.gyp:component_metrics_proto',
@@ skipping 290 matching lines @@
           },
           'variables': {
             'jni_gen_package': 'chromecast',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],  # end of targets
     }, {  # OS != "android"
       'targets': [
         {
-          'target_name': 'cast_crash_client',
-          'type': '<(component)',
-          'dependencies': [
-            '../breakpad/breakpad.gyp:breakpad_client',
-            '../components/components.gyp:crash_component',
-          ],
-          'sources': [
-            'crash/cast_crash_reporter_client.cc',
-            'crash/cast_crash_reporter_client.h',
-          ],
-          'conditions': [
-            ['chromecast_branding=="Chrome"', {
-              'dependencies': [
-                '<(cast_internal_gyp):crash_internal',
-              ],
-            }, {
-              'sources': [
-                'crash/cast_crash_reporter_client_simple.cc',
-              ],
-            }],
-          ]
-        },  # end of target 'cast_crash_client'
-        {
           'target_name': 'cast_shell_media',
           'type': '<(component)',
           'dependencies': [
             'media/media.gyp:cast_media',
             '../content/content.gyp:content',
             '../ipc/ipc.gyp:ipc',
             '../media/media.gyp:media',
           ],
           'sources': [
             'browser/media/cast_browser_cdm_factory.cc',
@@ skipping 26 matching lines @@
             'renderer/media/video_pipeline_proxy.h',
           ],
         },  # end of target 'cast_shell_media'
         # This target contains all of the primary code of |cast_shell|, except
         # for |main|. This allows end-to-end tests using |cast_shell|.
         # This also includes all targets that cannot be built on Android.
         {
           'target_name': 'cast_shell_core',
           'type': '<(component)',
           'dependencies': [
-            'cast_crash_client',
             'cast_net',
             'cast_shell_media',
             'cast_shell_common',
             'media/media.gyp:cast_media',
             '../ui/aura/aura.gyp:aura_test_support',
           ],
           'conditions': [
             ['chromecast_branding=="Chrome"', {
               'dependencies': [
                 '<(cast_internal_gyp):cast_gfx_internal',
@@ skipping 12 matching lines @@
             'cast_shell_core',
           ],
           'sources': [
             'app/cast_main.cc',
           ],
         },
       ],  # end of targets
     }],
   ],  # end of conditions
 }