Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / remoting_host.gypi

diff --git a/src/remoting/remoting_host.gypi b/src/remoting/remoting_host.gypi
index eca5646..60e0c38 100644 (file)
--- a/src/remoting/remoting_host.gypi
+++ b/src/remoting/remoting_host.gypi
@@ -21,9 +21,9 @@
         'enable_it2me_host': 0,
         'enable_remoting_host': 0,
       }],
-      ['chromeos==1', {
+      ['chromeos==1 and use_x11==1', {
         'enable_me2me_host': 0,
-        'enable_it2me_host': 0,
+        'enable_it2me_host': 1,
       }],
     ],
   },
@@ -74,6 +74,8 @@
             'host/capture_scheduler.h',
             'host/chromeos/aura_desktop_capturer.cc',
             'host/chromeos/aura_desktop_capturer.h',
+            'host/chromeos/message_box.cc',
+            'host/chromeos/message_box.h',
             'host/chromium_port_allocator_factory.cc',
             'host/chromium_port_allocator_factory.h',
             'host/chromoting_host.cc',
@@ -88,6 +90,8 @@
             'host/client_session.h',
             'host/client_session_control.h',
             'host/clipboard.h',
+            'host/clipboard_aura.cc',
+            'host/clipboard_aura.h',
             'host/clipboard_mac.mm',
             'host/clipboard_win.cc',
             'host/clipboard_x11.cc',
@@ -98,6 +102,7 @@
             'host/constants_mac.h',
             'host/continue_window.cc',
             'host/continue_window.h',
+            'host/continue_window_chromeos.cc',
             'host/continue_window_linux.cc',
             'host/continue_window_mac.mm',
             'host/continue_window_win.cc',
@@ -124,6 +129,7 @@
             'host/desktop_shape_tracker_mac.cc',
             'host/desktop_shape_tracker_win.cc',
             'host/desktop_shape_tracker_x11.cc',
+            'host/disconnect_window_chromeos.cc',
             'host/disconnect_window_linux.cc',
             'host/disconnect_window_mac.h',
             'host/disconnect_window_mac.mm',
@@ -227,6 +233,7 @@
             'host/pin_hash.h',
             'host/policy_hack/policy_watcher.cc',
             'host/policy_hack/policy_watcher.h',
+            'host/policy_hack/policy_watcher_chromeos.cc',
             'host/policy_hack/policy_watcher_linux.cc',
             'host/policy_hack/policy_watcher_mac.mm',
             'host/policy_hack/policy_watcher_win.cc',
@@ -310,7 +317,7 @@
                 ],
               },
             }],
-            ['OS=="linux" and chromeos==0', {
+            ['OS=="linux" and chromeos==0 and use_ozone==0', {
               'dependencies' : [
                 # Always use GTK on Linux, even for Aura builds.
                 '../build/linux/system.gyp:gtk',
@@ -318,29 +325,38 @@
             }],
             ['chromeos==1', {
               'dependencies' : [
-                '../ash/ash.gyp:ash',
                 '../cc/cc.gyp:cc',
+                '../components/components.gyp:policy_component_common',
                 '../content/content.gyp:content',
                 '../ppapi/ppapi_internal.gyp:ppapi_host',
                 '../skia/skia.gyp:skia',
                 '../ui/aura/aura.gyp:aura',
                 '../ui/compositor/compositor.gyp:compositor',
+                '../ui/events/events.gyp:events',
+                '../ui/views/views.gyp:views',
               ],
               'include_dirs': [
                 '../third_party/skia/include/utils',
               ],
               'sources!' : [
-                'host/continue_window.cc',
-                'host/continue_window.h',
+                'host/clipboard_x11.cc',
                 'host/continue_window_linux.cc',
                 'host/disconnect_window.cc',
                 'host/disconnect_window_linux.cc',
+                'host/policy_hack/policy_watcher_linux.cc',
                 'host/remoting_me2me_host.cc',
               ]
             }, {  # chromeos==0
                'sources!' : [
                  'host/chromeos/aura_desktop_capturer.cc',
                  'host/chromeos/aura_desktop_capturer.h',
+                 'host/chromeos/message_box.cc',
+                 'host/chromeos/message_box.h',
+                 'host/clipboard_aura.cc',
+                 'host/clipboard_aura.h',
+                 'host/continue_window_chromeos.cc',
+                 'host/disconnect_window_chromeos.cc',
+                 'host/policy_hack/policy_watcher_chromeos.cc',
                ],
             }],
             ['OS=="mac"', {
@@ -404,6 +420,11 @@
                 'message': 'Running message compiler on <(RULE_INPUT_PATH)',
               }],
             }],
+            ['use_ash==1', {
+              'dependencies': [
+                 '../ash/ash.gyp:ash',
+              ],
+            }],
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
@@ -431,6 +452,8 @@
           'sources': [
             'host/native_messaging/pipe_messaging_channel.cc',
             'host/native_messaging/pipe_messaging_channel.h',
+            'host/native_messaging/native_messaging_pipe.cc',
+            'host/native_messaging/native_messaging_pipe.h',
             'host/native_messaging/native_messaging_reader.cc',
             'host/native_messaging/native_messaging_reader.h',
             'host/native_messaging/native_messaging_writer.cc',
@@ -847,7 +870,7 @@
       ], # targets
     }], # end of OS!="win" and enable_me2me_host==1
 
-    ['OS!="win" and enable_it2me_host==1', {
+    ['OS!="win" and enable_it2me_host==1 and chromeos==0', {
       'targets': [
         {
           'target_name': 'remoting_it2me_native_messaging_host',
@@ -872,7 +895,7 @@
             'host/it2me/it2me_native_messaging_host_main.h',
           ],
           'conditions': [
-            ['OS=="linux" and chromeos==0', {
+            ['OS=="linux" and chromeos==0 and use_ozone==0', {
               'dependencies': [
                 # Always use GTK on Linux, even for Aura builds.
                 '../build/linux/system.gyp:gtk',