Final gyp patch to make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. Solaris was made to use ALSA also, as libasound has been ported to FreeBSD and Solaris as a wrapper around the native OSS.

Review URL: http://codereview.chromium.org/7055003

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

14 files changed, 27 insertions, 29 deletions

diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index b1548f9..ae31121 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -5,10 +5,10 @@
 {
   'variables': {
     'conditions': [
-      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+      [ 'os_posix == 1 and OS != "mac"', {
         # Link to system .so since we already use it due to GTK.
         'use_system_bzip2%': 1,
-      }, {  # OS!="linux"
+      }, {  # os_posix != 1 or OS == "mac"
         'use_system_bzip2%': 0,
       }],
     ],
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp
index 2d956e2..13fcae2 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -15,7 +15,7 @@
     ]
   },
   'conditions': [
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+    ['os_posix == 1 and OS != "mac"', {
       # On Linux, we implicitly already depend on expat via fontconfig;
       # let's not pull it in twice.
       'targets': [
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index ab732a2..01a5019 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -50,7 +50,7 @@
                 ],
               },
             }],
-            [ 'OS == "mac" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+            [ 'OS == "mac" or OS == "freebsd" or OS == "openbsd"', {
               'sources': [ 'kqueue.c' ],
               'include_dirs': [ 'mac' ]
             }],
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index b78918d..f04091c 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -72,7 +72,7 @@
             'OSX',
           ],
         }],
-        ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
+        ['os_posix == 1', {
           'defines': [
             'POSIX',
           ],
@@ -116,7 +116,7 @@
           'OSX',
         ],
       }],
-      ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
+      ['os_posix == 1', {
         'defines': [
           'POSIX',
         ],
@@ -324,7 +324,7 @@
             'source/talk/base/winping.h',
           ],
         }],
-        ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
+        ['os_posix == 1', {
           'sources': [
             'source/talk/base/sslstreamadapter.cc',
             'source/talk/base/sslstreamadapter.h',
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index e0f4f1d..9ca5b35f 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -5,10 +5,10 @@
 {
   'variables': {
     'conditions': [
-      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+      [ 'os_posix == 1 and OS != "mac"', {
         # Link to system .so since we already use it due to GTK.
         'use_system_libjpeg%': 1,
-      }, {  # OS!="linux" and OS!="freebsd" and OS!="openbsd"
+      }, {  # os_posix != 1 or OS == "mac"
         'use_system_libjpeg%': 0,
       }],
     ],
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index f565795..fdd3a57 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -5,10 +5,10 @@
 {
   'variables': {
     'conditions': [
-      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+      [ 'os_posix == 1 and OS != "mac"', {
         # Link to system .so since we already use it due to GTK.
         'use_system_libpng%': 1,
-      }, {  # OS!="linux" and OS!="freebsd" and OS!="openbsd"
+      }, {  # os_posix != 1 or OS == "mac"
         'use_system_libpng%': 0,
       }],
     ],
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 2a1a6c8..85aeadc 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -7,7 +7,7 @@
     'conditions': [
       # Define an "os_include" variable that points at the OS-specific generated
       # headers.  These were generated by running the configure script offline.
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+      ['os_posix == 1 and OS != "mac"', {
         'os_include': 'linux'
       }],
       ['OS=="mac"', {'os_include': 'mac'}],
@@ -19,8 +19,7 @@
     {
       'target_name': 'libxml',
       'conditions': [
-        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") '
-         'and use_system_libxml', {
+        ['os_posix == 1 and OS != "mac" and use_system_libxml', {
           'type': 'settings',
           'direct_dependent_settings': {
             'cflags': [
@@ -38,7 +37,7 @@
               '<!@(pkg-config --libs-only-l libxml-2.0)',
             ],
           },
-        }, { # else: OS != "linux" or ! use_system_libxml
+        }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml
           'type': 'static_library',
           'msvs_guid': 'F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7',
           'sources': [
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index 826bf5ec..3b00ffa 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -5,7 +5,7 @@
 {
   'variables': {
     'conditions': [
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+      ['os_posix == 1 and OS != "mac"', {
         'os_include': 'linux'
       }],
       ['OS=="mac"', {'os_include': 'mac'}],
@@ -21,8 +21,7 @@
     {
       'target_name': 'libxslt',
       'conditions': [
-        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") '
-         'and use_system_libxml', {
+        ['os_posix == 1 and OS != "mac" and use_system_libxml', {
           'type': 'settings',
           'direct_dependent_settings': {
             'cflags': [
@@ -37,7 +36,7 @@
               '<!@(pkg-config --libs-only-l libxslt)',
             ],
           },
-        }, { # else: OS != "linux" or ! use_system_libxml
+        }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml
           'type': 'static_library',
           'msvs_guid': 'FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED',
           'sources': [
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index e177ad55..031632a 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -19,7 +19,7 @@
           'HAVE_STRNLEN',
         ],
       }],
-      ['OS=="linux"', {
+      ['os_posix == 1 and OS != "mac"', {
         'cflags': [
           '-fPIC',
         ],
diff --git a/third_party/npapi/npapi.gyp b/third_party/npapi/npapi.gyp
index 193cddd..685aacc 100644
--- a/third_party/npapi/npapi.gyp
+++ b/third_party/npapi/npapi.gyp
@@ -26,7 +26,7 @@
         'bindings/npruntime.h',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['use_x11 == 1', {
           'sources': [
             'bindings/npapi_x11.h',
           ],
diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp
index b8bd079..3df4bdc 100644
--- a/third_party/qcms/qcms.gyp
+++ b/third_party/qcms/qcms.gyp
@@ -23,7 +23,7 @@
         ],
       },
       'conditions': [
-        ['OS=="linux" and (branding=="Chrome" or disable_sse2==1)', {
+        ['os_posix == 1 and OS != "mac" and (branding == "Chrome" or disable_sse2 == 1)', {
           'sources/': [
             ['exclude', 'transform-sse1.c'],
             ['exclude', 'transform-sse2.c'],
diff --git a/third_party/snappy/snappy.gyp b/third_party/snappy/snappy.gyp
index e24dc88..b5dbc8e 100644
--- a/third_party/snappy/snappy.gyp
+++ b/third_party/snappy/snappy.gyp
@@ -7,7 +7,7 @@
     'conditions': [
       # Define an "os_include" variable that points at the OS-specific generated
       # headers.  These were generated by running the configure script offline.
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+      ['os_posix == 1 and OS != "mac"', {
         'os_include': 'linux'
       }],
       ['OS=="mac"', {'os_include': 'mac'}],
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 1ce4346..93d8ede3 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -41,7 +41,7 @@
             ],
           },
         }],
-        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_sqlite', {
+        ['os_posix == 1 and OS != "mac" and use_system_sqlite', {
           'type': 'settings',
           'direct_dependent_settings': {
             'cflags': [
@@ -64,7 +64,7 @@
               '<!@(pkg-config --libs-only-l sqlite3)',
             ],
           },
-        }, { # else: OS != "linux" or ! use_system_sqlite
+        }, { # else: os_posix == 1 or OS == "mac" or ! use_system_sqlite
           'product_name': 'sqlite3',
           'type': 'static_library',
           'msvs_guid': '6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9',
@@ -110,7 +110,7 @@
             4018, 4244,
           ],
           'conditions': [
-            ['OS=="linux"', {
+            ['os_posix == 1 and OS != "mac"', {
               'cflags': [
                 # SQLite doesn't believe in compiler warnings,
                 # preferring testing.
@@ -125,7 +125,7 @@
     },
   ],
   'conditions': [
-    ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and not use_system_sqlite', {
+    ['os_posix == 1 and OS != "mac" and not use_system_sqlite', {
       'targets': [
         {
           'target_name': 'sqlite_shell',
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 6fa9e9d..7718da3 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -5,12 +5,12 @@
 {
   'variables': {
     'conditions': [
-      [ 'OS=="linux" or OS=="freebsd"', {
+      [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', {
         # Link to system .so since we already use it due to GTK.
         # TODO(pvalchev): OpenBSD is purposefully left out, as the system
         # zlib brings up an incompatibility that breaks rendering.
         'use_system_zlib%': 1,
-      }, {  # OS!="linux" and OS!="freebsd"
+      }, {  # os_posix != 1 or OS == "mac" or OS == "openbsd"
         'use_system_zlib%': 0,
       }],
     ],