diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 02:59:26 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 02:59:26 +0000 |
| commit | 943f4cc46a09d8eda57308e98f823c4b673144ee (patch) | |
| tree | 244525e261ec7746280dd62043eeae371545e36b /build | |
| parent | 573ae0ba31c4f19b20454c1fbfdcb43219a64566 (diff) | |
| download | chromium_src-943f4cc46a09d8eda57308e98f823c4b673144ee.zip chromium_src-943f4cc46a09d8eda57308e98f823c4b673144ee.tar.gz chromium_src-943f4cc46a09d8eda57308e98f823c4b673144ee.tar.bz2 | |
Fix Win64 official build due to missing pyauto target
r184171 broke the official build. This fix just disables
pyauto in the official build like it is in unofficial.
Review URL: https://chromiumcodereview.appspot.com/12321094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 1800bfd..8cf4090 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -659,7 +659,6 @@ '../chrome/chrome.gyp:crash_service', '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:policy_templates', - '../chrome/chrome.gyp:pyautolib', '../chrome/chrome.gyp:reliability_tests', '../chrome/chrome.gyp:automated_ui_tests', '../chrome/installer/mini_installer.gyp:mini_installer', @@ -670,6 +669,13 @@ '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', ], 'conditions': [ + # If you change this condition, make sure you also change it + # in chrome_tests.gypi + ['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', { + 'dependencies': [ + '../chrome/chrome.gyp:pyautolib', + ], + }], ['internal_pdf', { 'dependencies': [ '../pdf/pdf.gyp:pdf', |