summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 22:21:09 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 22:21:09 +0000
commit9a8f8cef87a8a49bb5637d5b20883f8e7548848c (patch)
tree3e5e48d0255a789edd906a0d7e8ad0c7fdbe4b4c /webkit
parent655372902c341c49f843304d52705cb6600c2adf (diff)
downloadchromium_src-9a8f8cef87a8a49bb5637d5b20883f8e7548848c.zip
chromium_src-9a8f8cef87a8a49bb5637d5b20883f8e7548848c.tar.gz
chromium_src-9a8f8cef87a8a49bb5637d5b20883f8e7548848c.tar.bz2
linux: retry on plugin fix.
Copy the Windows branch of the build file. This is super-screwed. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp9
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index d4d8f82..7beab04 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -117,6 +117,13 @@
],
# for: test_shell_gtk.cc
'cflags': ['-Wno-multichar'],
+ # See below TODO in the Windows branch.
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)/plugins',
+ 'files': ['<(PRODUCT_DIR)/libnpapi_layout_test_plugin.so'],
+ },
+ ],
}, { # else: OS!=linux
'sources/': [
['exclude', '_gtk\\.cc$'],
@@ -289,6 +296,7 @@
'target_name': 'npapi_layout_test_plugin',
'type': 'loadable_module',
'mac_bundle': 1,
+ 'product_dir': '<(PRODUCT_DIR)',
'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C',
'sources': [
'../npapi_layout_test_plugin/PluginObject.cpp',
@@ -351,6 +359,7 @@
'target_name': 'npapi_test_plugin',
'type': 'loadable_module',
'mac_bundle': 1,
+ 'product_dir': '<(PRODUCT_DIR)',
'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
'dependencies': [
'../../../base/base.gyp:base',