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

Unified Diff: build/all.gyp

Issue 99182: Rolling back webkit-gyp switch. r14382 (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 8 months 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 | « no previous file | chrome/app/chrome_dll.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 14835)
+++ build/all.gyp (working copy)
@@ -39,8 +39,6 @@
'../third_party/npapi/npapi.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/zlib/zlib.gyp:*',
- '../webkit/tools/test_shell/test_shell.gyp:*',
- '../webkit/webkit.gyp:*',
'temp_gyp/googleurl.gyp:*',
],
'conditions': [
@@ -70,6 +68,8 @@
['all_gyps', {
'dependencies': [
'../chrome/chrome.gyp:*',
+ '../webkit/tools/test_shell/test_shell.gyp:*',
+ '../webkit/webkit.gyp:*',
],
}],
],
« no previous file with comments | « no previous file | chrome/app/chrome_dll.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698