diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 20:37:15 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 20:37:15 +0000 |
| commit | 1ff642971f66d5ab94857e5aa475ed63be2a0ea8 (patch) | |
| tree | f59fac12d23c13792d9ddbe4459efebd37ce9dd4 /content/content.gyp | |
| parent | 841ce9e359de4f04a8838e9be17b0a383613a96b (diff) | |
| download | chromium_src-1ff642971f66d5ab94857e5aa475ed63be2a0ea8.zip chromium_src-1ff642971f66d5ab94857e5aa475ed63be2a0ea8.tar.gz chromium_src-1ff642971f66d5ab94857e5aa475ed63be2a0ea8.tar.bz2 | |
reland of http://crrev.com/212230 Create top-level separate targets for...
Original CL here: https://codereview.chromium.org/17619005/
Changed since previous landing is diff between ps1 and ps2.
Diff since previous landing is a bit noisy, but in those files
against original is relatively small. The conditions for the
defines were incorrect and are simpler (and correct) now.
Previously:
Create top-level separate targets for browser and child dlls
The general idea is that there's top level targets chrome and chrome_child,
and corresponding content_app and content_app_child that depend on only
the subtargets that should be included in the appropriate dll.
Currently (probably) Windows-only and requires setting chrome_multiple_dll=1
for gyp.
Links, but Blink is still included in browser.
Single-process mode is currently disabled when chrome_multiple_dll is set.
Current graph is at:
http://commondatastorage.googleapis.com/chromelinkgraph/deps.html generated by
"python tools\win\split_link\graph_dependencies.py deps.html"
Remove the previous hacky-er attempt at this that was named "split dll".
TBR=jam@chromium.org
BUG=237249, 256965
Review URL: https://codereview.chromium.org/19572013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/content/content.gyp b/content/content.gyp index 4def8b2..f938e36 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -52,7 +52,7 @@ 'content_common', ], 'conditions': [ - ['OS != "ios" and chrome_split_dll != 1', { + ['OS != "ios"', { 'dependencies': [ 'content_gpu', 'content_plugin', @@ -74,6 +74,31 @@ 'dependencies': [ 'content_common', ], + 'conditions': [ + ['chrome_multiple_dll', { + 'defines': [ + 'CHROME_MULTIPLE_DLL_BROWSER', + ], + }], + ], + }, + { + 'target_name': 'content_app_child', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'includes': [ + 'content_app.gypi', + ], + 'dependencies': [ + 'content_common', + ], + 'conditions': [ + ['chrome_multiple_dll', { + 'defines': [ + 'CHROME_MULTIPLE_DLL_CHILD', + ], + }], + ], }, { 'target_name': 'content_browser', @@ -87,18 +112,12 @@ 'content_resources.gyp:content_resources', ], 'conditions': [ - ['OS != "ios" and chrome_split_dll != 1', { + ['OS != "ios"', { 'dependencies': [ 'content_gpu', - 'content_renderer', 'content_utility', ], }], - ['chrome_split_dll', { - 'dependencies': [ - 'content_gpu', - ], - }], ['java_bridge==1', { 'dependencies': [ 'content_child', @@ -274,6 +293,11 @@ 'dependencies': ['content', 'content_browser'], }, { + 'target_name': 'content_app_child', + 'type': 'none', + 'dependencies': ['content', 'content_child'], + }, + { 'target_name': 'content_browser', 'type': 'none', 'dependencies': ['content'], |