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

Unified Diff: webkit/blob/webkit_blob.gypi

Issue 9254040: remove build_webkit_exes_from_webkit_gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put back blob's dependency on webkit, fix indentation Created 8 years, 11 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 | « webkit/appcache/webkit_appcache.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/blob/webkit_blob.gypi
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi
index 2acc390a61738455d60cc312a48f1f7e18563f34..eb5ec2cdf9b36fc82d926a3d6c7e0bee4ca1f84a 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/blob/webkit_blob.gypi
@@ -23,6 +23,7 @@
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/net/net.gyp:net',
+ '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'defines': [
'BLOB_IMPLEMENTATION'
@@ -54,14 +55,6 @@
'<(DEPTH)/webkit/support/webkit_support.gyp:glue',
],
}],
- [# TODO(dpranke): Remove once the circular dependencies in
- # WebKit.gyp are fixed on the mac.
- # See https://bugs.webkit.org/show_bug.cgi?id=68463
- 'OS!="mac"', {
- 'dependencies': [
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- ],
- }],
],
},
],
« no previous file with comments | « webkit/appcache/webkit_appcache.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698