Revert of Remote Assistance on Chrome OS Part I - Aura Desktop Capturer

remoting/remoting_host.gypi

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     'remoting_host_linux.gypi',
     'remoting_host_mac.gypi',
     'remoting_host_win.gypi',
   ],
 
   'variables': {
     'conditions': [
       # Remoting host is supported only on Windows, OSX and Linux (with X11).
-      ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
-        'enable_me2me_host': 1,
-        'enable_it2me_host': 1,
+      ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
         'enable_remoting_host': 1,
       }, {
-        'enable_me2me_host': 0,
-        'enable_it2me_host': 0,
         'enable_remoting_host': 0,
       }],
-      ['chromeos==1', {
-        'enable_me2me_host': 0,
-        'enable_it2me_host': 0,
-      }],
     ],
   },
 
   'conditions': [
     ['enable_remoting_host==1', {
       'targets': [
         {
           'target_name': 'remoting_host',
           'type': 'static_library',
           'variables': {
@@ skipping 27 matching lines @@
             'host/audio_scheduler.cc',
             'host/audio_scheduler.h',
             'host/audio_silence_detector.cc',
             'host/audio_silence_detector.h',
             'host/basic_desktop_environment.cc',
             'host/basic_desktop_environment.h',
             'host/branding.cc',
             'host/branding.h',
             'host/capture_scheduler.cc',
             'host/capture_scheduler.h',
-            'host/chromeos/aura_desktop_capturer.cc',
-            'host/chromeos/aura_desktop_capturer.h',
             'host/chromium_port_allocator_factory.cc',
             'host/chromium_port_allocator_factory.h',
             'host/chromoting_host.cc',
             'host/chromoting_host.h',
             'host/chromoting_host_context.cc',
             'host/chromoting_host_context.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/chromoting_param_traits.cc',
             'host/chromoting_param_traits.h',
@@ skipping 203 matching lines @@
             'host/win/session_input_injector.h',
             'host/win/window_station_and_desktop.cc',
             'host/win/window_station_and_desktop.h',
             'host/win/wts_terminal_monitor.cc',
             'host/win/wts_terminal_monitor.h',
             'host/win/wts_terminal_observer.h',
           ],
           'conditions': [
             ['OS=="linux"', {
               'dependencies': [
+                # Always use GTK on Linux, even for Aura builds.
+                '../build/linux/system.gyp:gtk',
                 '../build/linux/system.gyp:x11',
                 '../build/linux/system.gyp:xext',
                 '../build/linux/system.gyp:xfixes',
                 '../build/linux/system.gyp:xi',
                 '../build/linux/system.gyp:xrandr',
                 '../build/linux/system.gyp:xtst',
               ],
               'link_settings': {
                 'libraries': [
                   '-lpam',
                 ],
               },
             }],
-            ['OS=="linux" and chromeos==0', {
-              'dependencies' : [
-                # Always use GTK on Linux, even for Aura builds.
-                '../build/linux/system.gyp:gtk',
-              ],
-            }],
-            ['chromeos==1', {
-              'dependencies' : [
-                '../ash/ash.gyp:ash',
-                '../cc/cc.gyp:cc',
-                '../content/content.gyp:content',
-                '../ppapi/ppapi_internal.gyp:ppapi_host',
-                '../skia/skia.gyp:skia',
-                '../ui/aura/aura.gyp:aura',
-                '../ui/compositor/compositor.gyp:compositor',
-              ],
-              'include_dirs': [
-                '../third_party/skia/include/utils',
-              ],
-              'sources!' : [
-                'host/continue_window.cc',
-                'host/continue_window.h',
-                'host/continue_window_linux.cc',
-                'host/disconnect_window.cc',
-                'host/disconnect_window_linux.cc',
-                'host/remoting_me2me_host.cc',
-              ]
-            }, {  # chromeos==0
-               'sources!' : [
-                 'host/chromeos/aura_desktop_capturer.cc',
-                 'host/chromeos/aura_desktop_capturer.h',
-               ],
-            }],
             ['OS=="mac"', {
               'dependencies': [
                 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
               ],
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
                   'libpam.a',
                ],
               },
@@ skipping 76 matching lines @@
             'host/native_messaging/native_messaging_channel.cc',
             'host/native_messaging/native_messaging_channel.h',
             'host/native_messaging/native_messaging_reader.cc',
             'host/native_messaging/native_messaging_reader.h',
             'host/native_messaging/native_messaging_writer.cc',
             'host/native_messaging/native_messaging_writer.h',
           ],
         },  # end of target 'remoting_native_messaging_base'
 
         {
+          'target_name': 'remoting_me2me_host_static',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../net/net.gyp:net',
+            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
+            'remoting_base',
+            'remoting_breakpad',
+            'remoting_host',
+            'remoting_protocol',
+          ],
+          'defines': [
+            'VERSION=<(version_full)',
+          ],
+          'sources': [
+            'host/curtain_mode.h',
+            'host/curtain_mode_linux.cc',
+            'host/curtain_mode_mac.cc',
+            'host/curtain_mode_win.cc',
+            'host/posix/signal_handler.cc',
+            'host/posix/signal_handler.h',
+          ],
+          'conditions': [
+            ['os_posix != 1', {
+              'sources/': [
+                ['exclude', '^host/posix/'],
+              ],
+            }],
+          ],  # end of 'conditions'
+        },  # end of target 'remoting_me2me_host_static'
+
+        {
           'target_name': 'remoting_host_setup_base',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../google_apis/google_apis.gyp:google_apis',
             'remoting_host',
           ],
           'defines': [
             'VERSION=<(version_full)',
@@ skipping 29 matching lines @@
               'dependencies': [
                 '../google_update/google_update.gyp:google_update',
                 'remoting_lib_idl',
               ],
               # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
               'msvs_disabled_warnings': [4267, ],
             }],
           ],
         },  # end of target 'remoting_host_setup_base'
 
+        {
+          'target_name': 'remoting_it2me_host_static',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base_i18n',
+            '../net/net.gyp:net',
+            'remoting_base',
+            'remoting_host',
+            'remoting_infoplist_strings',
+            'remoting_protocol',
+            'remoting_resources',
+          ],
+          'defines': [
+            'VERSION=<(version_full)',
+          ],
+          'sources': [
+            'host/it2me/it2me_host.cc',
+            'host/it2me/it2me_host.h',
+            'host/it2me/it2me_native_messaging_host.cc',
+            'host/it2me/it2me_native_messaging_host.h',
+          ],
+        },  # end of target 'remoting_it2me_host_static'
+
         # Generates native messaging manifest files.
         {
           'target_name': 'remoting_native_messaging_manifests',
           'type': 'none',
           'conditions': [
             [ 'OS == "win"', {
               'variables': {
                 'me2me_host_path': 'remoting_native_messaging_host.exe',
                 'it2me_host_path': 'remote_assistance_host.exe',
               },
@@ skipping 92 matching lines @@
               '--template', '<(RULE_INPUT_PATH)',
               '--locale_output',
               '<(SHARED_INTERMEDIATE_DIR)/remoting/<(RULE_INPUT_ROOT)/@{json_suffix}.lproj/InfoPlist.strings',
               '<@(remoting_locales)',
             ]},
           ],
         },  # end of target 'remoting_infoplist_strings'
       ],  # end of 'targets'
     }],  # 'enable_remoting_host==1'
 
-    ['enable_me2me_host==1', {
-      'targets': [
-        {
-          'target_name': 'remoting_me2me_host_static',
-          'type': 'static_library',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../net/net.gyp:net',
-            '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-            'remoting_base',
-            'remoting_breakpad',
-            'remoting_host',
-            'remoting_protocol',
-          ],
-          'defines': [
-            'VERSION=<(version_full)',
-          ],
-          'sources': [
-            'host/curtain_mode.h',
-            'host/curtain_mode_linux.cc',
-            'host/curtain_mode_mac.cc',
-            'host/curtain_mode_win.cc',
-            'host/posix/signal_handler.cc',
-            'host/posix/signal_handler.h',
-          ],
-          'conditions': [
-            ['os_posix != 1', {
-              'sources/': [
-                ['exclude', '^host/posix/'],
-              ],
-            }],
-          ],  # end of 'conditions'
-        },  # end of target 'remoting_me2me_host_static'
-      ] # end of targets
-    }], # end of enable_me2me_host==1
-
-    ['enable_it2me_host==1', {
-      'targets': [
-        {
-          'target_name': 'remoting_it2me_host_static',
-          'type': 'static_library',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            '../base/base.gyp:base_i18n',
-            '../net/net.gyp:net',
-            'remoting_base',
-            'remoting_host',
-            'remoting_infoplist_strings',
-            'remoting_protocol',
-            'remoting_resources',
-          ],
-          'defines': [
-            'VERSION=<(version_full)',
-          ],
-          'sources': [
-            'host/it2me/it2me_host.cc',
-            'host/it2me/it2me_host.h',
-            'host/it2me/it2me_native_messaging_host.cc',
-            'host/it2me/it2me_native_messaging_host.h',
-          ],
-        },  # end of target 'remoting_it2me_host_static'
-      ] # end of targets
-    }], # end of 'enable_it2me_host==1'
-
-    ['OS!="win" and enable_me2me_host==1', {
+    ['OS!="win" and enable_remoting_host==1', {
       'targets': [
         {
           'target_name': 'remoting_me2me_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '<(icu_gyp_path):icudata',
             '../net/net.gyp:net',
@@ skipping 157 matching lines @@
                         '<(dump_product_syms_path)',
                         '<(version_full)',
                       ],
                     },  # end of postbuild 'dump_symbols'
                   ],  # end of 'postbuilds'
                 }],  # mac_breakpad==1
               ],  # conditions
             }],  # OS=mac
           ],
         },  # end of target 'remoting_me2me_native_messaging_host'
-      ], # targets
-    }], # end of OS!="win" and enable_me2me_host==1
-
-    ['OS!="win" and enable_it2me_host==1', {
-      'targets': [
         {
           'target_name': 'remoting_it2me_native_messaging_host',
           'type': 'executable',
           'product_name': 'remote_assistance_host',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_it2me_host_static',
             'remoting_native_messaging_base',
             'remoting_protocol',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/it2me/it2me_native_messaging_host_entry_point.cc',
             'host/it2me/it2me_native_messaging_host_main.cc',
             'host/it2me/it2me_native_messaging_host_main.h',
           ],
           'conditions': [
-            ['OS=="linux" and chromeos==0', {
+            ['OS=="linux"', {
               'dependencies': [
                 # Always use GTK on Linux, even for Aura builds.
                 '../build/linux/system.gyp:gtk',
               ],
             }],
             ['OS=="linux" and use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
@@ skipping 51 matching lines @@
                         '<(version_full)',
                       ],
                     },  # end of postbuild 'dump_symbols'
                   ],  # end of 'postbuilds'
                 }],  # mac_breakpad==1
               ],  # conditions
             }],  # OS=mac
           ],
         },  # end of target 'remoting_it2me_native_messaging_host'
       ],  # end of 'targets'
-    }],  # # end of OS!="win" and enable_it2me_host==1
+    }],  # OS!="win"
 
   ],  # end of 'conditions'
 }