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

9 files changed, 29 insertions, 25 deletions

diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
index 257a9da..e33635b 100644
--- a/ui/base/strings/ui_strings.gyp
+++ b/ui/base/strings/ui_strings.gyp
@@ -40,7 +40,7 @@
     },
   ],
   'conditions': [
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+    ['os_posix == 1 and OS != "mac"', {
       'targets': [{
         'target_name': 'ui_unittest_strings',
         'type': 'none',
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index 98adcf8..8a6f66a 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -8,12 +8,12 @@
       ['exclude', '_(gl|win)\\.(cc?)$'],
     ],
     'conditions': [
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-        ['include', '_(gl)\\.cc$'],
-      ]}],
-      ['OS=="win"', {'sources/': [
-        ['include', '_(win)\\.cc$'],
-      ]}],
+      ['os_posix == 1 and OS != "mac"', {
+        'sources/': [['include', '_(gl)\\.cc$'],]
+      }],
+      ['OS == "win"', {
+        'sources/': [['include', '_(win)\\.cc$'],]
+      }],
     ],
   },
   'targets': [
@@ -33,7 +33,7 @@
         'compositor_gl.cc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'sources!': [
             'compositor.cc',
           ],
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp
index 83acee4..da520bd 100644
--- a/ui/gfx/gl/gl.gyp
+++ b/ui/gfx/gl/gl.gyp
@@ -10,7 +10,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$'],
@@ -123,7 +123,7 @@
         },
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="win"', {
+        ['OS != "mac"', {
           'sources': [
             'egl_util.cc',
             'egl_util.h',
@@ -138,7 +138,7 @@
             '<(DEPTH)/third_party/angle/include',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['use_x11 == 1', {
           'sources': [
             'gl_context_glx.cc',
             'gl_context_glx.h',
diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp
index 0cbfe94..19aa1ba 100644
--- a/ui/gfx/surface/surface.gyp
+++ b/ui/gfx/surface/surface.gyp
@@ -10,11 +10,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?)$'],
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 4e15b6c..046a836 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?)$'],
diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi
index e9e891e..1f20b43 100644
--- a/ui/ui_base.gypi
+++ b/ui/ui_base.gypi
@@ -60,7 +60,7 @@
         'base/range/range.mm',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi
index be50592..04c0d88 100644
--- a/ui/ui_gfx.gypi
+++ b/ui/ui_gfx.gypi
@@ -132,7 +132,7 @@
             '../third_party/wtl/include',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # font_gtk.cc uses fontconfig.
             # TODO(evanm): I think this is wrong; it should just use GTK.
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 0c1fce0..aae12d0 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -90,7 +90,7 @@
             ],
           },
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../app/app.gyp:app_base',
             '../build/linux/system.gyp:gtk',
diff --git a/ui/ui_views.gypi b/ui/ui_views.gypi
index e7e54f7..b291bd4 100644
--- a/ui/ui_views.gypi
+++ b/ui/ui_views.gypi
@@ -60,7 +60,7 @@
         '../',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',