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

Unified Diff: webkit/blob/webkit_blob.gypi

Issue 8741002: update dependencies in preparation for glue being a component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « content/content_tests.gypi ('k') | webkit/glue/webkit_glue.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 57769b83b6c64660e9fff4de774a6b4fab144ac6..2acc390a61738455d60cc312a48f1f7e18563f34 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/blob/webkit_blob.gypi
@@ -3,6 +3,15 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ 'webkit_src_dir': '../../../../..',
+ },{
+ 'webkit_src_dir': '../../third_party/WebKit',
+ }],
+ ],
+ },
'targets': [
{
'target_name': 'blob',
@@ -45,6 +54,14 @@
'<(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 | « content/content_tests.gypi ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698