diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 09:22:13 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 09:22:13 +0000 |
| commit | 0344352e57d0e0b583c4b373ddbeff801b770425 (patch) | |
| tree | 2a807ae00ae704d3b3c245fa6490036dc6b54772 /build | |
| parent | 4e1a7a5742ee0289d7920e0bd54e8f0365205962 (diff) | |
| download | chromium_src-0344352e57d0e0b583c4b373ddbeff801b770425.zip chromium_src-0344352e57d0e0b583c4b373ddbeff801b770425.tar.gz chromium_src-0344352e57d0e0b583c4b373ddbeff801b770425.tar.bz2 | |
Exclude win64 cross-compile dependencies from normal win64 build
BUG=166496
R=scottmg@chromium.org
TBR=scottmg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12252059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 0e7c36f..599b5fe 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -651,7 +651,6 @@ 'dependencies': [ '../chrome/chrome.gyp:chromedriver', '../chrome/chrome.gyp:crash_service', - '../chrome/chrome.gyp:crash_service_win64', '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:policy_templates', '../chrome/chrome.gyp:pyautolib', @@ -660,7 +659,6 @@ '../chrome/installer/mini_installer.gyp:mini_installer', '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../courgette/courgette.gyp:courgette', - '../courgette/courgette.gyp:courgette64', '../cloud_print/cloud_print.gyp:cloud_print', '../remoting/remoting.gyp:remoting_webapp', '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', @@ -671,6 +669,12 @@ '../pdf/pdf.gyp:pdf', ], }], # internal_pdf + ['target_arch=="ia32"', { + 'dependencies': [ + '../chrome/chrome.gyp:crash_service_win64', + '../courgette/courgette.gyp:courgette64', + ], + }], ['component != "shared_library" and wix_exists == "True" and \ sas_dll_exists == "True"', { 'dependencies': [ @@ -723,6 +727,10 @@ ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:crash_service', + ], + }], + ['OS=="win" and target_arch=="ia32"', { + 'dependencies': [ '../chrome/chrome.gyp:crash_service_win64', ], }], |