summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 20:04:01 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 20:04:01 +0000
commit71563f8e5e28e67e877dbbff75449928716b5025 (patch)
tree6e8d15430fc341f76994ef288b5b991f477bab09 /chrome/chrome_tests.gypi
parentb52249a38d1984b4909518eac1d349c518a491b5 (diff)
downloadchromium_src-71563f8e5e28e67e877dbbff75449928716b5025.zip
chromium_src-71563f8e5e28e67e877dbbff75449928716b5025.tar.gz
chromium_src-71563f8e5e28e67e877dbbff75449928716b5025.tar.bz2
PyAuto for Chrome OS
Build pyauto for chrome OS on linux x86_64 only if linux_fpic == 1 Otherwise, builds normally on 32 bit. Still needs work to point to the right python. BUG=http://code.google.com/p/chromium-os/issues/detail?id=1504 TEST=builds should be green Review URL: http://codereview.chromium.org/633003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rwxr-xr-xchrome/chrome_tests.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9e5d95d..a5d108e 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1841,7 +1841,8 @@
},
]}, # 'targets'
], # OS=="win"
- ['OS=="mac" or (OS=="linux" and linux_fpic==1)', {
+ # Build on linux x86_64 only if linux_fpic==1
+ ['OS=="mac" or (OS=="linux" and (host_arch!="x86_64" or linux_fpic==1))', {
'targets': [
# TODO(nirnimesh): enable for win - crbug.com/32285
{