Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: remoting/remoting_host.gypi

Issue 639233002: Remote assistance on Chrome OS Part IV - It2MeHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build error on ozone Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_host.gypi
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index fdc333e354e0cb96d49ac06a175305d396738f81..d4e2406fc31fba4473eb28ba6fefceb7258386c3 100644
--- a/remoting/remoting_host.gypi
+++ b/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,
}],
],
},
@@ -98,6 +98,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 +125,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 +229,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',
@@ -319,6 +322,7 @@
['chromeos==1', {
'dependencies' : [
'../cc/cc.gyp:cc',
+ '../components/components.gyp:policy_component_common',
'../content/content.gyp:content',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../skia/skia.gyp:skia',
@@ -329,8 +333,7 @@
'../third_party/skia/include/utils',
],
'sources!' : [
- 'host/continue_window.cc',
- 'host/continue_window.h',
+ 'host/policy_hack/policy_watcher_linux.cc',
'host/continue_window_linux.cc',
'host/disconnect_window.cc',
'host/disconnect_window_linux.cc',
@@ -340,6 +343,9 @@
'sources!' : [
'host/chromeos/aura_desktop_capturer.cc',
'host/chromeos/aura_desktop_capturer.h',
+ 'host/continue_window_chromeos.cc',
+ 'host/disconnect_window_chromeos.cc',
+ 'host/policy_hack/policy_watcher_chromeos.cc',
],
}],
['OS=="mac"', {
@@ -853,7 +859,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',
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698