diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:49:41 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:49:41 +0000 |
| commit | cb5e507bf311305117bc727d94921e89c2dee7de (patch) | |
| tree | 22f7032c4d0770a3042d5d5cd64e37733aa3af38 /views | |
| parent | 0d920aacaa1c7439ad940b282ea84dd3c3dacfd4 (diff) | |
| download | chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.zip chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.tar.gz chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.tar.bz2 | |
Make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11 for the gyp files. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. I also added Solaris to the remaining grit files.
Patch by ruben (chromium@hybridsource.org).
Review URL: http://codereview.chromium.org/7011032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/views.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/views/views.gyp b/views/views.gyp index baa9e72..01937a1 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', |