linux: fix and build test plugins on 64-bit builds

webkit/tools/test_shell/test_shell.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,
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       'resources/pan_east.cur',
@@ skipping 104 matching lines @@
         '../../../base/base.gyp:base',
         '../../../net/net.gyp:net',
         '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '../../webkit.gyp:glue',
         '../../api/WebKit.gyp:webkit',
       ],
       'conditions': [
         # http://code.google.com/p/chromium/issues/detail?id=18337
         ['target_arch!="x64"', {
           'dependencies': [
-            'npapi_layout_test_plugin',
             'npapi_test_plugin',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             'test_shell_resources',
             '../../../build/linux/system.gyp:gtk',
             '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           # for:  test_shell_gtk.cc
           'cflags': ['-Wno-multichar'],
         }, { # else: OS!=linux
           'sources/': [
             ['exclude', '_gtk\\.cc$'],
             ['exclude', '_x11\\.cc$'],
           ],
         }],
-        ['OS=="linux" and target_arch!="x64"', {
+        ['OS=="linux"', {
           # See below TODO in the Windows branch.
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/plugins',
               'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
             },
           ],
         }],
         ['OS!="mac"', {
           'sources/': [
@@ skipping 307 matching lines @@
           'msvs_disabled_warnings': [ 4800 ],
         }, {  # else: OS!=win
           'sources!': [
             '../../../skia/ext/vector_canvas_unittest.cc',
             '../webcore_unit_tests/UniscribeHelper_unittest.cpp',
             '../webcore_unit_tests/TransparencyWin_unittest.cpp',
           ],
         }],
       ],
     },
+    {
+      'target_name': 'npapi_layout_test_plugin',
+      'type': 'loadable_module',
+      'mac_bundle': 1,
+      'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
+      'sources': [
+        '../npapi_layout_test_plugin/PluginObject.cpp',
+        '../npapi_layout_test_plugin/TestObject.cpp',
+        '../npapi_layout_test_plugin/main.cpp',
+        '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+        '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
+      ],
+      'include_dirs': [
+        '../../..',
+      ],
+      'dependencies': [
+        '../../../third_party/npapi/npapi.gyp:npapi',
+        '../../../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+      ],
+      'msvs_disabled_warnings': [ 4996 ],
+      'mac_bundle_resources': [
+        '../npapi_layout_test_plugin/Info.r',
+      ],
+      'xcode_settings': {
+        'INFOPLIST_FILE': '../npapi_layout_test_plugin/Info.plist',
+      },
+      'conditions': [
+        ['OS!="win"', {
+          'sources!': [
+            '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
+            '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
+          ],
+        # TODO(bradnelson):
+        # This copy should really live here, as a post-build step,
+        # but it's currently being implemented via
+        # AdditionalDependencies, which tries to do the copy before
+        # the file is built...
+        #
+        }, { # OS == "win"
+        #  # The old VS build would explicitly copy the .dll into the
+        #  # plugins subdirectory like this.  It might be possible to
+        #  # use the 'product_dir' setting to build directly into
+        #  # plugins/ (as is done on Linux), but we'd need to verify
+        #  # that nothing breaks first.
+        #  'copies': [
+        #    {
+        #      'destination': '<(PRODUCT_DIR)/plugins',
+        #      'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
+        #    },
+        #  ],
+          'link_settings': {
+            'libraries': [
+              "winmm.lib",
+             ],
+          },
+        }],
+        ['OS=="mac"', {
+          'product_name': 'TestNetscapePlugIn',
+          'product_extension': 'plugin',
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+            ],
+          },
+        }],
+        ['OS=="linux" and target_arch=="x64"', {
+          # Shared libraries need -fPIC on x86-64
+          'cflags': ['-fPIC']
+        }],
+      ],
+    },
   ],
   'conditions': [
-    # http://code.google.com/p/chromium/issues/detail?id=18337
     ['target_arch!="x64"', {
       'targets': [
         {
-          'target_name': 'npapi_layout_test_plugin',
-          'type': 'loadable_module',
-          'mac_bundle': 1,
-          'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
-          'sources': [
-            '../npapi_layout_test_plugin/PluginObject.cpp',
-            '../npapi_layout_test_plugin/TestObject.cpp',
-            '../npapi_layout_test_plugin/main.cpp',
-            '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
-            '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
-          ],
-          'include_dirs': [
-            '../../..',
-          ],
-          'dependencies': [
-            '../../../third_party/npapi/npapi.gyp:npapi',
-            '../../../third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
-          ],
-          'msvs_disabled_warnings': [ 4996 ],
-          'mac_bundle_resources': [
-            '../npapi_layout_test_plugin/Info.r',
-          ],
-          'xcode_settings': {
-            'INFOPLIST_FILE': '../npapi_layout_test_plugin/Info.plist',
-          },
-          'conditions': [
-            ['OS!="win"', {
-              'sources!': [
-                '../npapi_layout_test_plugin/npapi_layout_test_plugin.def',
-                '../npapi_layout_test_plugin/npapi_layout_test_plugin.rc',
-              ],
-            # TODO(bradnelson):
-            # This copy should really live here, as a post-build step,
-            # but it's currently being implemented via
-            # AdditionalDependencies, which tries to do the copy before
-            # the file is built...
-            #
-            }, { # OS == "win"
-            #  # The old VS build would explicitly copy the .dll into the
-            #  # plugins subdirectory like this.  It might be possible to
-            #  # use the 'product_dir' setting to build directly into
-            #  # plugins/ (as is done on Linux), but we'd need to verify
-            #  # that nothing breaks first.
-            #  'copies': [
-            #    {
-            #      'destination': '<(PRODUCT_DIR)/plugins',
-            #      'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'],
-            #    },
-            #  ],
-              'link_settings': {
-                'libraries': [
-                  "winmm.lib",
-                 ],
-              },
-            }],
-            ['OS=="mac"', {
-              'product_name': 'TestNetscapePlugIn',
-              'product_extension': 'plugin',
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-                ],
-              },
-            }],
-          ],
-        },
-        {
           'target_name': 'npapi_test_plugin',
           'type': 'loadable_module',
           'mac_bundle': 1,
           'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
           'dependencies': [
             '../../../base/base.gyp:base',
             '../../../third_party/icu/icu.gyp:icuuc',
             '../../../third_party/npapi/npapi.gyp:npapi',
           ],
           'sources': [
@@ skipping 43 matching lines @@
           'include_dirs': [
             '../../..',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': '../../glue/plugins/test/Info.plist',
           },
           'conditions': [
             ['OS!="win"', {
               'sources!': [
                 # TODO(port):  Port these.
-
-                # plugin_npobject_lifetime_test.cc has win32-isms
+                 # plugin_npobject_lifetime_test.cc has win32-isms
                 #   (HWND, CALLBACK).
                 '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
-
-                # The windowed/windowless APIs are necessarily
+                 # The windowed/windowless APIs are necessarily
                 # platform-specific.
                 '../../glue/plugins/test/plugin_window_size_test.cc',
                 '../../glue/plugins/test/plugin_windowed_test.cc',
                 '../../glue/plugins/test/plugin_windowless_test.cc',
-
-                # Seems windows specific.
+                 # Seems windows specific.
                 '../../glue/plugins/test/plugin_create_instance_in_paint.cc',
                 '../../glue/plugins/test/plugin_create_instance_in_paint.h',
-
-                # windows-specific resources
+                 # windows-specific resources
                 '../../glue/plugins/test/npapi_test.def',
                 '../../glue/plugins/test/npapi_test.rc',
               ],
             }],
             ['OS=="mac"', {
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
                 ],
               },
             }],
+            ['OS=="linux" and target_arch=="x64"', {
+              # Shared libraries need -fPIC on x86-64
+              'cflags': ['-fPIC']
+            }],
           ],
         },
       ],
     }],
     ['OS=="linux"', {
       'targets': [
         {
           'target_name': 'test_shell_resources',
           'type': 'none',
           'actions': [
@@ skipping 55 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: