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 /content/content.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 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/content/content.gyp b/content/content.gyp index f790279..ef4a087 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -64,7 +64,7 @@ 'content_common', ], 'conditions': [ - ['OS != "ios"', { + ['OS != "ios" and chrome_split_dll != 1', { 'dependencies': [ 'content_gpu', 'content_plugin', @@ -99,12 +99,17 @@ 'content_resources.gyp:content_resources', ], 'conditions': [ - ['OS != "ios"', { + ['OS != "ios" and chrome_split_dll != 1', { 'dependencies': [ 'content_gpu', 'content_renderer', ], }], + ['chrome_split_dll', { + 'dependencies': [ + 'content_gpu', + ], + }], ], }, { |