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

Unified Diff: views/views.gyp

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: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 6a8e1c71203992218f452af661602e3acf8d1574..b071379a1401bb171e732f12691fd7228c7af2fd 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -8,7 +8,7 @@
},
'conditions': [
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['os_posix == 1 and OS != "mac"', {
'conditions': [
['sysroot!=""', {
'variables': {
@@ -29,7 +29,7 @@
['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
+ ['toolkit_uses_gtk == 1', {'sources/': [
['include', '/gtk/'],
['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
['include', '/(gtk|x11)_[^/]*\\.cc$'],
@@ -398,7 +398,7 @@
'<(DEPTH)/third_party/wtl/include',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
'../build/linux/system.gyp:x11',
@@ -519,7 +519,7 @@
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
'../chrome/chrome.gyp:packed_resources',
@@ -607,7 +607,7 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
'../chrome/chrome.gyp:packed_resources',
« chrome/chrome_tests.gypi ('K') | « ui/ui_views.gypi ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698