Final gyp patch to make use of the new cross-platform POSIX defines t…

…oolkit_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
dednal · May 23, 2011 · 6a654d4 · 6a654d4
1 parent fcc2d5f
commit 6a654d4
Show file tree

Hide file tree

Showing 30 changed files with 77 additions and 81 deletions.
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
@@ -106,7 +106,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'toolkit_uses_gtk == 1', {
           'dependencies': [
             # Workaround for gyp bug 69.
             # Needed to handle the #include chain:
@@ -132,7 +132,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'toolkit_uses_gtk == 1', {
           'dependencies': [
             # Workaround for gyp bug 69.
             # Needed to handle the #include chain:

diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
@@ -18,7 +18,7 @@
         4018,
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'conditions': [
             [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
@@ -38,7 +38,7 @@
               }
             ],
           ],
-        }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+        }, {  # os_posix != 1 or OS == "mac"
             'sources/': [
               ['exclude', '_nss\.cc$'],
             ],
@@ -192,7 +192,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
@@ -204,7 +204,7 @@
           'dependencies': [
             '../build/linux/system.gyp:nss',
           ],
-        }, {  # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
+        }, {  # os_posix != 1 or OS == "mac"
           'sources!': [
             'rsa_private_key_nss_unittest.cc',
           ]

diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
@@ -52,7 +52,7 @@
         'framework/window.h',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': ['../../build/linux/system.gyp:gtk'],
         }],
       ],

diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
@@ -230,7 +230,7 @@
         'command_buffer/service/texture_manager.cc',
       ],
       'conditions': [
-        ['OS == "linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],

diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
@@ -13,7 +13,7 @@
       ['exclude', '/win_[^/]*\\.cc$'],
     ],
     'conditions': [
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
+      ['os_posix == 1 and OS != "mac"', {'sources/': [
         ['include', '_posix(_unittest)?\\.cc$'],
       ]}],
       ['OS=="mac"', {'sources/': [
@@ -58,12 +58,12 @@
         'sync_socket_unittest.cc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
-        ['OS=="linux"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [

diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
@@ -110,7 +110,7 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk'
           ],

diff --git a/media/media.gyp b/media/media.gyp
@@ -206,7 +206,7 @@
             'video/mft_h264_decode_engine.h',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS == "linux" or OS == "freebsd" or OS == "solaris"', {
           'link_settings': {
             'libraries': [
               '-lasound',
@@ -228,7 +228,7 @@
             'audio/openbsd/audio_manager_openbsd.h',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'sources': [
             'filters/omx_video_decoder.cc',
             'filters/omx_video_decoder.h',
@@ -237,7 +237,7 @@
             'omx_wrapper',
           ]
         }],
-        ['OS=="linux"', {
+        ['os_posix == 1 and OS != "mac"', {
           'sources!': [
             'video/capture/video_capture_device_dummy.cc',
             'video/capture/video_capture_device_dummy.h',
@@ -310,7 +310,7 @@
         '..',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
             '-msse2',
           ],
@@ -337,7 +337,7 @@
         'ffmpeg/ffmpeg_unittest.cc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
@@ -422,7 +422,7 @@
         'video/ffmpeg_video_decode_engine_unittest.cc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
@@ -625,7 +625,7 @@
             'tools/shader_bench/window.h',
           ],
           'conditions': [
-            ['OS=="linux"', {
+            ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
@@ -665,7 +665,7 @@
         },
       ],
     }],
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+    ['os_posix == 1 and OS != "mac"', {
       'targets': [
         {
           'target_name': 'omx_test',
@@ -697,7 +697,7 @@
             '../testing/gtest.gyp:gtest',
           ],
           'conditions': [
-            ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+            ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],

diff --git a/net/net.gyp b/net/net.gyp
@@ -726,7 +726,7 @@
             ],
           },
         ],
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'toolkit_uses_gtk == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gconf',
               '../build/linux/system.gyp:gdk',
@@ -995,7 +995,7 @@
              'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'toolkit_uses_gtk == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
               '../build/linux/system.gyp:nss',
@@ -1007,7 +1007,7 @@
             ],
           }
         ],
-        [ 'OS == "linux"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -1171,7 +1171,7 @@
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
-        ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
@@ -1184,7 +1184,7 @@
             }],
           ],
         }],
-        ['OS == "linux"', {
+        ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ -1292,7 +1292,7 @@
     },
   ],
   'conditions': [
-     ['OS=="linux"', {
+     ['os_posix == 1 and OS != "mac"', {
        'targets': [
          {
            'target_name': 'flip_in_mem_edsm_server',

diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
@@ -4,7 +4,7 @@
 
 {
   'conditions': [
-    [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+    [ 'os_posix == 1 and OS != "mac"', {
       'conditions': [
         ['sysroot!=""', {
           'variables': {
@@ -105,7 +105,7 @@
             ],
           },
         ],
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'defines': [
             # These macros are needed only for compiling the files in
             # ssl/bodge.

diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
@@ -17,7 +17,7 @@
       # TODO(ajwong): For internal pepper plugins, which are statically linked
       # into chrome, do we want to build w/o -fPIC?  If so, how can we express
       # that in the build system?
-      ['OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris"', {
+      ['os_posix == 1 and OS != "mac"', {
         'cflags': ['-fPIC', '-fvisibility=hidden'],
 
         # This is needed to make the Linux shlib build happy. Without this,

diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
@@ -31,7 +31,7 @@
             ],
           },
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['os_posix == 1 and OS != "mac"', {
           'product_name': 'ppapi_example',
           'type': 'shared_library',
           'cflags': ['-fvisibility=hidden'],

diff --git a/printing/printing.gyp b/printing/printing.gyp
@@ -89,15 +89,15 @@
         ],
       },
       'conditions': [
-        ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{
+        ['toolkit_uses_gtk == 0',{
             'sources/': [['exclude', '_cairo\\.cc$']]
         }],
         ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']]
           }, {  # else: OS=="win"
             'sources/': [['exclude', '_posix\\.cc$']]
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['toolkit_uses_gtk == 1', {
           'sources': [
             'metafile_skia_wrapper.cc',
             'metafile_skia_wrapper.h',
@@ -172,21 +172,19 @@
         'units_unittest.cc',
       ],
       'conditions': [
-        ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
+        ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
         ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
           }, {  # else: OS=="win"
             'sources/': [['exclude', '_cairo_unittest\\.cc$']]
           }
         ],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-            'dependencies': [
-              '../build/linux/system.gyp:gtk',
-           ],
-        }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
           'conditions': [
-            ['linux_use_tcmalloc==1', {
+            ['linux_use_tcmalloc == 1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
@@ -21,7 +21,7 @@
         'plugin_extension': 'plugin',
         'plugin_prefix': '',
       }],
-      ['OS=="linux"', {
+      ['os_posix == 1 and OS != "mac"', {
         'plugin_extension': 'so',
         'plugin_prefix': 'lib',
       }],
@@ -46,7 +46,7 @@
   },
 
   'conditions': [
-    ['OS=="linux" or OS=="mac"', {
+    ['os_posix == 1', {
       'targets': [
         # Simple webserver for testing remoting client plugin.
         {
@@ -60,7 +60,7 @@
     }],
 
     # TODO(hclam): Enable this target for mac.
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+    ['use_x11 == 1', {
 
       'targets': [
         {
@@ -345,7 +345,7 @@
         'host/user_authenticator_win.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -575,7 +575,7 @@
         '..',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
             '-msse2',
           ],
@@ -670,7 +670,7 @@
         'run_all_unittests.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../app/app.gyp:app_base',
             # Needed for the following #include chain:

diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
@@ -126,7 +126,7 @@
     ],
   },
   'conditions': [
-    [ 'OS=="freebsd" or OS=="openbsd"', {
+    [ 'os_posix == 1 and OS != "mac" and OS != "linux"', {
       # GYP requires that each file have at least one target defined.
       'targets': [
         {