Index: chrome/chrome.gyp |
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp |
index 4b520a839c57688dc9c1e0fdcadd2cd0ba89440a..f4ef67b35db3afdbea52c6f822409c2a739fa575 100644 |
--- a/chrome/chrome.gyp |
+++ b/chrome/chrome.gyp |
@@ -10,7 +10,13 @@ |
# the link of the actual chrome (or chromium) executable on |
# Linux or Mac, and into chrome.dll on Windows. |
# NOTE: Most new includes should go in the OS!="ios" condition below. |
- 'chromium_dependencies': [ |
+ 'chromium_browser_dependencies': [ |
+ 'common', |
+ 'browser', |
+ '../content/content.gyp:content_app', |
+ '../sync/sync.gyp:sync', |
+ ], |
+ 'chromium_child_dependencies': [ |
'common', |
'browser', |
jam
2013/05/07 20:56:24
why does child depend on browser?
scottmg
2013/05/07 22:41:03
Haven't started on getting child to actually build
jam
2013/05/07 23:08:16
it's still there?
|
'../content/content.gyp:content_app', |
@@ -24,7 +30,14 @@ |
'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], |
'conditions': [ |
['OS!="ios"', { |
- 'chromium_dependencies': [ |
+ 'chromium_browser_dependencies': [ |
jam
2013/05/07 20:56:24
i'm a bit confused: why does browser depend on plu
scottmg
2013/05/07 22:41:03
No good reason. Mostly just to get something check
|
+ 'debugger', |
+ 'plugin', |
+ 'utility', |
+ '../content/content.gyp:content_ppapi_plugin', |
+ '../printing/printing.gyp:printing', |
+ ], |
+ 'chromium_child_dependencies': [ |
'debugger', |
'plugin', |
'renderer', |
@@ -46,7 +59,11 @@ |
'app/resources/locale_settings_win.grd', |
},], |
['OS!="android" and OS!="ios"', { |
- 'chromium_dependencies': [ |
+ 'chromium_browser_dependencies': [ |
+ # Android doesn't use the service process (only needed for print). |
+ 'service', |
+ ], |
+ 'chromium_child_dependencies': [ |
# Android doesn't use the service process (only needed for print). |
'service', |
], |