Revert 55766 - Enable -fPIC by default on x64...

chrome/chrome_tests.gypi

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_dll_resource.h',
       'common/pref_names.cc',
       'common/pref_names.h',
@@ skipping 462 matching lines @@
         },],
         ['OS=="win"', {
           'sources': [
             '../sandbox/tests/validation_tests/commands.cc',
             '../sandbox/tests/validation_tests/commands.h',
             '../sandbox/tests/common/controller.h',
             'test/nacl_security_tests/nacl_security_tests_win.h',
             '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'],
+        },],
       ],
     },
     {
       'target_name': 'nacl_sandbox_tests',
       'type': 'executable',
       'msvs_guid': '3087FC25-2C24-44B2-8253-44065EB47ACD',
       'dependencies': [
         'chrome',
         'browser',
         'debugger',
@@ skipping 1976 matching lines @@
             ],
           },
           'sources': [
             'test/chrome_plugin/test_chrome_plugin.cc',
             'test/chrome_plugin/test_chrome_plugin.def',
             'test/chrome_plugin/test_chrome_plugin.h',
           ],
         },
       ]},  # '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)', {
+     'or (OS=="linux" and target_arch==python_arch '
+     'and (target_arch!="x64" or linux_fpic==1))', {
       'targets': [
         {
           # Documentation: http://dev.chromium.org/developers/pyauto
           'target_name': 'pyautolib',
           'type': 'shared_library',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
             'debugger',
             'syncapi',
@@ skipping 284 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: