Enable -fPIC by default on x64

gpu/demos/demos.gyp

Index: gpu/demos/demos.gyp
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index e7fc57eaf6ae142696665b43c639a75c534c1f1d..4229138ad1c5de7cb96a86a99af9f57d4f7284dd 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -5,18 +5,6 @@
 {
   'variables': {
     'chromium_code': 1,
-    'conditions': [
-      # 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,
-      }],
-    ],
   },
   'targets': [
     {
@@ -200,96 +188,90 @@
         'gles2_book/texture_wrap.cc',
       ],
     },
-  ],
-  'conditions': [
-    ['enable_pepper_demos==1', {
-      'targets': [
-        {
-          'target_name': 'hello_triangle_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/hello_triangle.cc',
-          ],
-        },
-        {
-          'target_name': 'mip_map_2d_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:mip_map_2d',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/mip_map_2d.cc',
-          ],
-        },
-        {
-          'target_name': 'simple_texture_2d_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:simple_texture_2d',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/simple_texture_2d.cc',
-          ],
-        },
-        {
-          'target_name': 'simple_texture_cubemap_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:simple_texture_cubemap',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/simple_texture_cubemap.cc',
-          ],
-        },
-        {
-          'target_name': 'simple_vertex_shader_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:simple_vertex_shader',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/simple_vertex_shader.cc',
-          ],
-        },
-        {
-          'target_name': 'stencil_test_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:stencil_test',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/stencil_test.cc',
-          ],
-        },
-        {
-          'target_name': 'texture_wrap_pepper',
-          'type': 'loadable_module',
-          'dependencies': [
-            'gpu_demo_framework_pepper',
-            '../../third_party/gles2_book/gles2_book.gyp:texture_wrap',
-          ],
-          'sources': [
-            'gles2_book/example.h',
-            'gles2_book/texture_wrap.cc',
-          ],
-        },
+    {
+      'target_name': 'hello_triangle_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/hello_triangle.cc',
+      ],
+    },
+    {
+      'target_name': 'mip_map_2d_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:mip_map_2d',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/mip_map_2d.cc',
+      ],
+    },
+    {
+      'target_name': 'simple_texture_2d_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:simple_texture_2d',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/simple_texture_2d.cc',
+      ],
+    },
+    {
+      'target_name': 'simple_texture_cubemap_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:simple_texture_cubemap',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/simple_texture_cubemap.cc',
+      ],
+    },
+    {
+      'target_name': 'simple_vertex_shader_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:simple_vertex_shader',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/simple_vertex_shader.cc',
+      ],
+    },
+    {
+      'target_name': 'stencil_test_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:stencil_test',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/stencil_test.cc',
       ],
-    }],
+    },
+    {
+      'target_name': 'texture_wrap_pepper',
+      'type': 'loadable_module',
+      'dependencies': [
+        'gpu_demo_framework_pepper',
+        '../../third_party/gles2_book/gles2_book.gyp:texture_wrap',
+      ],
+      'sources': [
+        'gles2_book/example.h',
+        'gles2_book/texture_wrap.cc',
+      ],
+    },
   ],
 }