The gyp files don't have a way to refer to POSIX-like OS's as a group, so I defined os_posix, toolkit_gtk, and use_x11 in common.gypi to handle them. I used something similar when porting Chromium 10 and 11 to OpenBSD and Solaris, plus a version of this patch has been tested on FreeBSD.

Chromium has also been built on other BSDs, so rather than adding each Unix to every gyp file individually every time another port is added, these broad defines can be used instead and modified with specific logic only where necessary.

I included a few modified gyp files so the usage can be seen.  I also added sunos5 to some grd/html files and set the default host_arch on i86pc solaris to ia32.

BUG=0
TEST={}

Patch by ruben <chromium@hybridsource.org>.
Review URL: http://codereview.chromium.org/6965007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85154 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 13 deletions

diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 065cbf4..1e96171 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -309,7 +309,7 @@
             '<(tcmalloc_dir)/src/debugallocation.cc',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
           'sources!': [
             '<(tcmalloc_dir)/src/system-alloc.h',
             '<(tcmalloc_dir)/src/windows/port.cc',
diff --git a/base/base.gyp b/base/base.gyp
index 6953ede..0e3c72d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -20,7 +20,7 @@
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk==1', {
           'dependencies': [
             # i18n/rtl.cc uses gtk
             '../build/linux/system.gyp:gtk',
@@ -233,7 +233,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+        ['toolkit_uses_gtk==1', {
           'sources!': [
             'file_version_info_unittest.cc',
           ],
@@ -260,7 +260,7 @@
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
-        }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+        }, {  # toolkit_uses_gtk!=1
           'sources!': [
             'message_pump_glib_unittest.cc',
           ]
@@ -303,7 +303,7 @@
         'base',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk==1', {
           'dependencies': [
             # test_suite initializes GTK.
             '../build/linux/system.gyp:gtk',
@@ -348,7 +348,7 @@
         ],
       },
       'conditions': [
-        ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+        ['toolkit_uses_gtk==1', {
           'dependencies': [
             # Needed to handle the #include chain:
             #   base/test/perf_test_suite.h
diff --git a/base/base.gypi b/base/base.gypi
index 578e50d..56da313 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -354,7 +354,7 @@
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
         'conditions': [
-          [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
+          [ 'toolkit_uses_gtk==0', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
@@ -406,12 +406,12 @@
               'string16.cc',
             ],
           },],
-          ['OS=="freebsd" or OS=="openbsd"', {
+          ['os_posix==1 and OS!="linux" and OS!="mac"', {
             'sources!': [
-              'base/files/file_path_watcher_linux.cc',
+              'files/file_path_watcher_linux.cc',
             ],
             'sources': [
-              'base/files/file_path_watcher_stub.cc',
+              'files/file_path_watcher_stub.cc',
             ],
           }],
         ],
@@ -442,7 +442,7 @@
         ],
       },
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+        [ 'toolkit_uses_gtk==1', {
           'conditions': [
             [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
@@ -477,7 +477,7 @@
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
           ],
-        }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+        }, {  # toolkit_uses_gtk!=1
             'sources/': [
               ['exclude', '/xdg_user_dirs/'],
               ['exclude', '_nss\.cc$'],
@@ -627,7 +627,7 @@
         },
       ],
     }],
-    [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+    [ 'os_posix==1 and OS!="mac"', {
       'targets': [
         {
           'target_name': 'symbolize',