diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:14:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:14:43 +0000 |
| commit | 6cc885ec00eed3a8bf07e8f501f009695e0a74a5 (patch) | |
| tree | 44f59bc5b797cd115a1cbd4373e595f2172ab45f /chrome/chrome.gyp | |
| parent | 79f302e16c067c234e50403f765785d2c58a75de (diff) | |
| download | chromium_src-6cc885ec00eed3a8bf07e8f501f009695e0a74a5.zip chromium_src-6cc885ec00eed3a8bf07e8f501f009695e0a74a5.tar.gz chromium_src-6cc885ec00eed3a8bf07e8f501f009695e0a74a5.tar.bz2 | |
Revert 212230 "Create top-level separate targets for browser and..."
Caused Linux x64 sizes to fail for reasons unclear.
> 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.
>
> Pull bluetooth_utils from bluetooth_device into separate common target
> as it's referenced from chrome/common/extensions.
>
> 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/17619005
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/19572012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 199862d..afb2c77 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -18,7 +18,7 @@ ], 'chromium_child_dependencies': [ 'common', - '../content/content.gyp:content_app_child', + '../content/content.gyp:content_app', '../sync/sync.gyp:sync', ], 'allocator_target': '../base/allocator/allocator.gyp:allocator', @@ -30,8 +30,9 @@ 'conditions': [ ['OS!="ios"', { 'chromium_browser_dependencies': [ + 'debugger', + '../content/content.gyp:content_ppapi_plugin', '../printing/printing.gyp:printing', - '../ppapi/ppapi_internal.gyp:ppapi_host', ], 'chromium_child_dependencies': [ 'debugger', @@ -41,6 +42,7 @@ '../content/content.gyp:content_gpu', '../content/content.gyp:content_ppapi_plugin', '../content/content.gyp:content_worker', + '../printing/printing.gyp:printing', '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_resources', ], }], |