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

Unified Diff: build/all.gyp

Issue 16300009: remove webkit.gyp (and the test_shell target) and update affected targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix missing commas Created 7 years, 6 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/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 2c2bbcf5d50e0296837745a88232222c9bd89596..97d4086e15ef16ddba49ada1f9afc90472f92835 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -66,7 +66,6 @@
'../v8/tools/gyp/v8.gyp:*',
'../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:*',
'../webkit/support/webkit_support.gyp:*',
- '../webkit/webkit.gyp:*',
'<(libjpeg_gyp_path):*',
],
}, { # 'OS=="ios"'
@@ -256,7 +255,7 @@
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
- '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
+ '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn',
'../ui/app_list/app_list.gyp:app_list_unittests',
'../ui/views/views.gyp:views_unittests',
],
@@ -632,7 +631,7 @@
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:googleurl_unittests',
'../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
- '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
+ '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn',
],
'conditions': [
['target_arch!="x64"', {
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698