Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 6d2982ed3ba763eece95472facbdbcfe4b737222..f25bc7b52d532d1e441e972a003bc399f612b404 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -596,10 +596,6 @@ |
'test/nacl_security_tests/nacl_security_tests_win.cc', |
], |
},], |
- # set fPIC for linux in case it isn't set. |
- ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { |
- 'cflags': ['-fPIC'], |
- },], |
], |
}, |
{ |
@@ -2628,10 +2624,8 @@ |
}, |
]}, # 'targets' |
], # OS=="win" |
- # Build on linux x86_64 only if linux_fpic==1 |
['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))', { |
+ 'or (OS=="linux" and target_arch==python_arch)', { |
'targets': [ |
{ |
# Documentation: http://dev.chromium.org/developers/testing/pyauto |