diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 17:51:02 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 17:51:02 +0000 |
| commit | 56c248b2e4d720c201269cf459efb65ca5396f40 (patch) | |
| tree | 060ddd818a9d8ad713ed3eea6d11ae8f81ee9c37 /chrome/chrome.gyp | |
| parent | bc87c1e3758b85b5c997c21a5e9b0351c92482c5 (diff) | |
| download | chromium_src-56c248b2e4d720c201269cf459efb65ca5396f40.zip chromium_src-56c248b2e4d720c201269cf459efb65ca5396f40.tar.gz chromium_src-56c248b2e4d720c201269cf459efb65ca5396f40.tar.bz2 | |
Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (reland)
Currently contains chrome_browser_dll target. Removes some paths from browser->webcore
via content that are there due to single process mode, and removes dependency of content
on content_renderer.
Current remaining paths from chrome_browser_dll to webcore: http://i.imgur.com/7WWRvpA.jpg
Reland of https://chromiumcodereview.appspot.com/14682014
TBR=cpu@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/14794004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4b520a8..7487ae09 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', ], |