Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1925)

Unified Diff: chromecast/chromecast.gyp

Issue 876633003: Chromecast: make GYP targets more common between Android/Chromecast.Makes cast_crash_client common a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates commit message Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 60de9bf17eb546e0bfb7a18bfc7c15d532ec050a..45d4fad8a5754d1b2353cff5243e7a6386e416ea 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -45,6 +45,29 @@
],
}, # 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': [
@@ -113,6 +136,7 @@
'type': '<(component)',
'dependencies': [
'cast_base',
+ 'cast_crash_client',
'cast_shell_pak',
'cast_shell_resources',
'cast_version_header',
@@ -423,29 +447,6 @@
}, { # 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': [
@@ -492,7 +493,6 @@
'target_name': 'cast_shell_core',
'type': '<(component)',
'dependencies': [
- 'cast_crash_client',
'cast_net',
'cast_shell_media',
'cast_shell_common',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698