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

Unified Diff: webkit/glue/webkit_glue.gypi

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and added spaces, collapsed one check Created 9 years, 7 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
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 1b1f3df84c3dec4388333d6f2ea440a42690c4e9..16b7197eeab34e9f35b4b6d77ca4555c818233b1 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -445,15 +445,14 @@
# own hard dependencies.
'hard_dependency': 1,
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
'sources!': [
'plugins/plugin_stubs.cc',
],
- }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \
- # and OS!="solaris"'
+ }, { # else: toolkit_uses_gtk != 1
'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
['exclude', r'/gtk_']],
}],

Powered by Google App Engine
This is Rietveld 408576698