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

Unified Diff: ui/ui.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: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 4e15b6c4361343938986e9a3ef3daed7d1612d6a..046a836d3614bdaec1b6a7ff9a211d9f7633af00 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -14,11 +14,13 @@
['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
- ['include', '/gtk/'],
- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
- ['include', '/(gtk|x11)_[^/]*\\.cc$'],
- ]}],
+ ['toolkit_uses_gtk == 1', {
+ 'sources/': [
+ ['include', '/gtk/'],
+ ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
+ ['include', '/(gtk|x11)_[^/]*\\.cc$'],
+ ],
+ }],
['OS=="mac"', {'sources/': [
['include', '/cocoa/'],
['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],
« chrome/chrome_tests.gypi ('K') | « ui/gfx/surface/surface.gyp ('k') | ui/ui_base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698