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

gpu/demos/demos.gyp

 # Copyright (c) 2009 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': {
     'chromium_code': 1,
     'conditions': [
-      ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
+      # Pepper demos that are compiled as shared libraries need to be compiled
+      # with -fPIC flag. All static libraries that these demos depend on must
+      # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1"
+      # compiles everything with -fPIC. Disable pepper demos on linux/x64
+      # unless linux_fpic is 1.
+      ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
+        'enable_pepper_demos%': 0,
+      }, {
         'enable_pepper_demos%': 1,
-      }, {
-        'enable_pepper_demos%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'gpu_demo_framework',
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base',
       ],
@@ skipping 267 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: