summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 00:46:48 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 00:46:48 +0000
commit41959d484cd571ecde36f030f1c455a7ba6a886e (patch)
tree104221a340edaa47c654999f0f603e52a90fb5dc
parent346bc34f27c57ee7d8c36205ba178dff046d9e4a (diff)
downloadchromium_src-41959d484cd571ecde36f030f1c455a7ba6a886e.zip
chromium_src-41959d484cd571ecde36f030f1c455a7ba6a886e.tar.gz
chromium_src-41959d484cd571ecde36f030f1c455a7ba6a886e.tar.bz2
Disable pyautolib for chromium multi dll build. Will reenable it
once it compiles for multi dll build. R=maruel BUG=none TEST=none Review URL: http://codereview.chromium.org/3050003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52976 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_tests.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cac77e5..b4a42ac 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2430,7 +2430,8 @@
]}, # 'targets'
], # OS=="win"
# Build on linux x86_64 only if linux_fpic==1
- ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch==python_arch '
+ ['OS=="mac" or (OS=="win" and component=="static_library") '
+ 'or (OS=="linux" and target_arch==python_arch '
'and (target_arch!="x64" or linux_fpic==1))', {
'targets': [
{