Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1314)

Unified Diff: webkit/tools/test_shell/test_shell.gyp

Issue 385084: Partially revert WebKit.gyp switch-over, because it broke build bot setup... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/default_plugin/default_plugin.gyp ('k') | webkit/webkit_glue.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.gyp
===================================================================
--- webkit/tools/test_shell/test_shell.gyp (revision 31883)
+++ webkit/tools/test_shell/test_shell.gyp (working copy)
@@ -37,10 +37,10 @@
'../../../third_party/npapi/npapi.gyp:npapi',
'../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
'../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
- '../../webkit_glue.gyp:appcache',
- '../../webkit_glue.gyp:database',
- '../../webkit_glue.gyp:glue',
- '../../webkit_glue.gyp:inspector_resources',
+ '../../webkit.gyp:appcache',
+ '../../webkit.gyp:database',
+ '../../webkit.gyp:glue',
+ '../../webkit.gyp:inspector_resources',
'npapi_layout_test_plugin',
],
'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
@@ -119,7 +119,7 @@
'../../../net/net.gyp:net',
'../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
'../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
- '../../webkit_glue.gyp:glue',
+ '../../webkit.gyp:glue',
],
'conditions': [
# http://code.google.com/p/chromium/issues/detail?id=18337
@@ -344,8 +344,8 @@
}, { # OS != "mac"
'dependencies': [
'../../../net/net.gyp:net_resources',
- '../../webkit_glue.gyp:webkit_resources',
- '../../webkit_glue.gyp:webkit_strings',
+ '../../webkit.gyp:webkit_resources',
+ '../../webkit.gyp:webkit_strings',
]
}],
],
« no previous file with comments | « webkit/default_plugin/default_plugin.gyp ('k') | webkit/webkit_glue.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698