Last gyp patch for cross-platform Unix support

remoting/remoting.gyp

 # 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': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     'conditions': [
       ['OS=="mac"', {
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
           }],  # branding
         ],  # conditions
         'plugin_extension': 'plugin',
         'plugin_prefix': '',
       }],
-      ['OS=="linux"', {
+      ['os_posix == 1 and OS != "mac"', {
         'plugin_extension': 'so',
         'plugin_prefix': 'lib',
       }],
       ['OS=="win"', {
         'plugin_extension': 'dll',
         'plugin_prefix': '',
       }],
       ['branding=="Chrome"', {
         'host_plugin_mime_type': 'application/vnd.google-chrome.remoting-host',
       }, {  # else: branding!="Chrome"
         'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
       }],  # branding
     ],
   },
 
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
   },
 
   'conditions': [
-    ['OS=="linux" or OS=="mac"', {
+    ['os_posix == 1', {
       'targets': [
         # Simple webserver for testing remoting client plugin.
         {
           'target_name': 'remoting_client_test_webserver',
           'type': 'executable',
           'sources': [
             'tools/client_webserver/main.c',
           ],
         }
       ],  # end of target 'remoting_client_test_webserver'
     }],
 
     # TODO(hclam): Enable this target for mac.
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+    ['use_x11 == 1', {
 
       'targets': [
         {
           'target_name': 'remoting_x11_client',
           'type': 'executable',
           'dependencies': [
             'remoting_base',
             'remoting_client',
             'remoting_jingle_glue',
           ],
@@ skipping 262 matching lines @@
         'host/screen_recorder.cc',
         'host/screen_recorder.h',
         'host/support_access_verifier.cc',
         'host/support_access_verifier.h',
         'host/user_authenticator.h',
         'host/user_authenticator_linux.cc',
         'host/user_authenticator_mac.cc',
         'host/user_authenticator_win.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
           'sources': [
             'host/x_server_pixel_buffer.cc',
             'host/x_server_pixel_buffer.h',
           ],
           'link_settings': {
             'libraries': [
               '-lX11',
@@ skipping 207 matching lines @@
       ],
     }, # end of target differ_block
 
     {
       'target_name': 'differ_block_sse2',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
             '-msse2',
           ],
         }],
       ],
       'sources': [
         'host/differ_block_sse2.cc',
       ],
     }, # end of target differ_block_sse2
 
@@ skipping 74 matching lines @@
         'protocol/message_reader_unittest.cc',
         'protocol/protocol_mock_objects.cc',
         'protocol/protocol_mock_objects.h',
         'protocol/rtp_video_reader_unittest.cc',
         'protocol/rtp_video_writer_unittest.cc',
         'protocol/session_manager_pair.cc',
         'protocol/session_manager_pair.h',
         'run_all_unittests.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../app/app.gyp:app_base',
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
             #   ../base/test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
@@ skipping 13 matching lines @@
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: