summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 16:19:01 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 16:19:01 +0000
commit699c26c98e5397d59db332c794915b87089eaceb (patch)
tree57d4e2039198dd79ed21fa7669b2f5aaa250ab0a /webkit
parenta29616b6fbed50cb21cbf9f50a765da8d84f03ec (diff)
downloadchromium_src-699c26c98e5397d59db332c794915b87089eaceb.zip
chromium_src-699c26c98e5397d59db332c794915b87089eaceb.tar.gz
chromium_src-699c26c98e5397d59db332c794915b87089eaceb.tar.bz2
Fix up PathProvider on the Mac for FILE_MODULE.
PathProvider on the Mac always returned the FILE_EXE for FILE_MODULE, which isn't necessarily correct. BUG=NONE TEST=BUILD Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86631 Review URL: http://codereview.chromium.org/7019041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi12
1 files changed, 2 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 3ba3abb..4c77a2f 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -282,7 +282,8 @@
['OS=="mac"', {
'product_name': 'TestShell',
'dependencies': [
- 'layout_test_helper', 'copy_mesa',
+ 'layout_test_helper',
+ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
],
'variables': {
'repack_path': '../../../tools/data_pack/repack.py',
@@ -749,15 +750,6 @@
],
},
},
- {
- 'target_name': 'copy_mesa',
- 'type': 'none',
- 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa'],
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
- 'files': ['<(PRODUCT_DIR)/osmesa.so'],
- }],
- },
],
}],
],