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

Unified Diff: base/base.gyp

Issue 6965007: Define os_posix in gyp files to get new Unix platforms added quickly (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: whoops, fixed mistake 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
« no previous file with comments | « base/allocator/allocator.gyp ('k') | base/base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 6953eded6f5ada37948841b4c4ad70425d1908e4..0e3c72d338855fbf1dc4479ac15bae5c64d041fc 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -20,7 +20,7 @@
'../third_party/icu/icu.gyp:icuuc',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk==1', {
'dependencies': [
# i18n/rtl.cc uses gtk
'../build/linux/system.gyp:gtk',
@@ -233,7 +233,7 @@
'../testing/gtest.gyp:gtest',
],
'conditions': [
- ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+ ['toolkit_uses_gtk==1', {
'sources!': [
'file_version_info_unittest.cc',
],
@@ -260,7 +260,7 @@
'../build/linux/system.gyp:nss',
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
- }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+ }, { # toolkit_uses_gtk!=1
'sources!': [
'message_pump_glib_unittest.cc',
]
@@ -303,7 +303,7 @@
'base',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk==1', {
'dependencies': [
# test_suite initializes GTK.
'../build/linux/system.gyp:gtk',
@@ -348,7 +348,7 @@
],
},
'conditions': [
- ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+ ['toolkit_uses_gtk==1', {
'dependencies': [
# Needed to handle the #include chain:
# base/test/perf_test_suite.h
« no previous file with comments | « base/allocator/allocator.gyp ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698