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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_common.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: 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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2ff892a49b82f8717a60748589244814766db399..d5e2dfbd09015997348a1e87248e4261327a4ee3 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -256,7 +256,7 @@
'common/zip.h',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk==1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -272,7 +272,7 @@
],
},
},],
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+ [ 'os_posix==1 and OS!="mac"', {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
@@ -387,7 +387,7 @@
'../third_party/icu/icu.gyp:icuuc',
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ [ 'os_posix==1 and OS!="mac"', {
'conditions': [
['use_openssl==1', {
'dependencies': [
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698