summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-18 20:37:15 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-18 20:37:15 +0000
commit1ff642971f66d5ab94857e5aa475ed63be2a0ea8 (patch)
treef59fac12d23c13792d9ddbe4459efebd37ce9dd4 /content/content_common.gypi
parent841ce9e359de4f04a8838e9be17b0a383613a96b (diff)
downloadchromium_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_common.gypi')
-rw-r--r--content/content_common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index f55381c..aaa7659 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -377,7 +377,7 @@
'../gpu/gpu.gyp:gpu_ipc',
'../ipc/ipc.gyp:ipc',
'../media/media.gyp:shared_memory_support',
- '../third_party/WebKit/public/blink.gyp:blink',
+ '../third_party/WebKit/public/blink.gyp:blink_minimal',
'../ui/gl/gl.gyp:gl',
'../webkit/common/webkit_common.gyp:webkit_common',
'../webkit/storage_browser.gyp:webkit_storage_browser',