| Index: chrome/chrome.gyp
|
| diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
|
| index 4b520a839c57688dc9c1e0fdcadd2cd0ba89440a..7487ae09596f517f469ed445c1890f0d87d07b2a 100644
|
| --- a/chrome/chrome.gyp
|
| +++ b/chrome/chrome.gyp
|
| @@ -10,12 +10,17 @@
|
| # 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',
|
| + '../content/content.gyp:content_app',
|
| + '../sync/sync.gyp:sync',
|
| + ],
|
| 'allocator_target': '../base/allocator/allocator.gyp:allocator',
|
| 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
|
| 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
|
| @@ -24,7 +29,12 @@
|
| 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
|
| 'conditions': [
|
| ['OS!="ios"', {
|
| - 'chromium_dependencies': [
|
| + 'chromium_browser_dependencies': [
|
| + 'debugger',
|
| + '../content/content.gyp:content_ppapi_plugin',
|
| + '../printing/printing.gyp:printing',
|
| + ],
|
| + 'chromium_child_dependencies': [
|
| 'debugger',
|
| 'plugin',
|
| 'renderer',
|
| @@ -46,7 +56,7 @@
|
| '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',
|
| ],
|
|
|