Make the gyp files more cross-platform across the Unices

webkit/tools/test_shell/test_shell.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       '../../glue/resources/pan_east.cur',
       '../../glue/resources/pan_middle.cur',
@@ skipping 102 matching lines @@
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
       ],
       'conditions': [
         ['target_arch!="arm"', {
           'dependencies': [
             'copy_npapi_test_plugin',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk==1', {
           'dependencies': [
             'test_shell_resources',
             '<(DEPTH)/build/linux/system.gyp:gtk',
             '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           # for:  test_shell_gtk.cc
           'cflags': ['-Wno-multichar'],
         }],
         ['OS=="win"', {
           'msvs_disabled_warnings': [ 4800 ],
@@ skipping 20 matching lines @@
       ],
     },
     {
       'target_name': 'test_shell_pak',
       'type': 'none',
       'variables': {
         'repack_path': '../../../tools/data_pack/repack.py',
         'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
       },
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['os_posix==1 and OS!="mac"', {
           'actions': [
             {
               'action_name': 'test_shell_repack',
               'variables': {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
@@ skipping 83 matching lines @@
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk==1', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:gtk',
             'test_shell_resources',
@@ skipping 176 matching lines @@
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk==1', {
           'dependencies': [
             'test_shell_pak',
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
           'sources!': [
              # TODO(port)
             '../../../skia/ext/platform_canvas_unittest.cc',
           ],
         }],
         ['chromeos==1', {
@@ skipping 21 matching lines @@
             '../../../skia/ext/bitmap_platform_device_mac_unittest.cc',
           ],
         }],
         ['OS=="win"', {
           'msvs_disabled_warnings': [ 4800 ],
         }, {  # else: OS!=win
           'sources!': [
             '../../../skia/ext/vector_canvas_unittest.cc',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
+        ['os_posix==1 and OS!="mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
@@ skipping 99 matching lines @@
               ],
             }],
             ['OS=="mac"', {
               'product_extension': 'plugin',
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
                 ],
               },
             }],
-            ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+            ['os_posix==1 and OS!="mac"', {
               'sources!': [
                 # Needs simple event record type porting
                 '../../plugins/npapi/test/plugin_windowless_test.cc',
               ],
             }],
-            ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', {
+            ['os_posix==1 and OS!="mac" and (target_arch=="x64" or target_arch=="arm")', {
               # Shared libraries need -fPIC on x86-64
               'cflags': ['-fPIC']
             }],
           ],
         },
         {
           'target_name': 'copy_npapi_test_plugin',
           'type': 'none',
           'dependencies': [
             'npapi_test_plugin',
           ],
           'conditions': [
             ['OS=="win"', {
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/plugins',
                   'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'],
                 },
               ],
             }],
             ['OS=="mac"', {
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/plugins/',
                   'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'],
                 },
               ]
             }],
-            ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+            ['os_posix==1 and OS!="mac"', {
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/plugins',
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
-    ['OS=="linux"  or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+    ['os_posix==1 and OS!="mac"', {
       'targets': [
         {
           'target_name': 'test_shell_resources',
           'type': 'none',
           'actions': [
             {
               'action_name': 'test_shell_resources',
               'variables': {
                 'grit_path': '../../../tools/grit/grit.py',
                 'input_path': './test_shell_resources.grd',
@@ skipping 68 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: