summaryrefslogtreecommitdiffstats
path: root/content/content.gyp
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 00:14:17 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 00:14:17 +0000
commit0a999393b6ff0b45e70ad14e3c3e637da5ec8119 (patch)
tree5196baa57b53c61cbb8f949212758e000e91e8c3 /content/content.gyp
parent1d2d5a40c5db4efc968e74bfb0baf49c8a6e3adc (diff)
downloadchromium_src-0a999393b6ff0b45e70ad14e3c3e637da5ec8119.zip
chromium_src-0a999393b6ff0b45e70ad14e3c3e637da5ec8119.tar.gz
chromium_src-0a999393b6ff0b45e70ad14e3c3e637da5ec8119.tar.bz2
Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target
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 R=cpu@chromium.org BUG=237249 Review URL: https://chromiumcodereview.appspot.com/14682014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
-rw-r--r--content/content.gyp9
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',
+ ],
+ }],
],
},
{