summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 20:13:09 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 20:13:09 +0000
commitd2906c814ba00d3d13a1d125fc48e1eb3f5e775f (patch)
tree0dc45d6413eb2809599a307fce35ed76266657f8 /webkit
parent04a40f841b662a1e28bd579cc68fa3a57e233bbd (diff)
downloadchromium_src-d2906c814ba00d3d13a1d125fc48e1eb3f5e775f.zip
chromium_src-d2906c814ba00d3d13a1d125fc48e1eb3f5e775f.tar.gz
chromium_src-d2906c814ba00d3d13a1d125fc48e1eb3f5e775f.tar.bz2
Use the better gyp pattern to make sure test_shell.pak is installed next
to test_shell on Linux. Review URL: http://codereview.chromium.org/59004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp10
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index fa40326..f67b87e 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -170,14 +170,16 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
],
'outputs': [
- '<(PRODUCT_DIR)/test_shell.pak',
+ '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
],
'action': ['python', '../../../tools/data_pack/repack.py', '<@(_outputs)', '<@(_inputs)'],
},
],
- 'scons_depends': [
- ['<(PRODUCT_DIR)/test_shell'],
- ['<(PRODUCT_DIR)/test_shell.pak'],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': ['<(INTERMEDIATE_DIR)/repack/test_shell.pak'],
+ },
],
}],
['OS=="mac"', {