diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-08 19:17:05 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-08 19:17:05 +0000 |
| commit | 2b1902c80badae0a4b37cbfd9ae0236513c50e32 (patch) | |
| tree | 3839efc36f04997782cec3190c347ed17f036e99 /chrome/chrome_dll.gypi | |
| parent | 8808d027f5310dde7f606efc354188b13c15cd3a (diff) | |
| download | chromium_src-2b1902c80badae0a4b37cbfd9ae0236513c50e32.zip chromium_src-2b1902c80badae0a4b37cbfd9ae0236513c50e32.tar.gz chromium_src-2b1902c80badae0a4b37cbfd9ae0236513c50e32.tar.bz2 | |
fix linking of chrome.dll linking both browser/child in non-multiple
In normal static build (non-multiple dll) both content_app_browser
and content_app_child were getting linked into chrome. Fix this
by only linking content_app_both in non-multiple mode.
R=robertshield@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/22394004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 7c831d3..a64ad95 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -242,9 +242,12 @@ }, { 'dependencies': [ '<@(chromium_child_dependencies)', - '../content/content.gyp:content_app_child', + '../content/content.gyp:content_app_both', '../content/content.gyp:content_worker', ], + 'dependencies!': [ + '../content/content.gyp:content_app_browser', + ], }], ['OS=="mac" and component!="shared_library"', { 'includes': [ 'chrome_dll_bundle.gypi' ], |