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

Unified Diff: remoting/remoting_host.gypi

Issue 543243003: Remote Assistance on Chrome OS Part I - Aura Desktop Capturer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: remoting/remoting_host.gypi
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index e387e93e7e2b31e121d91c66a8a98f2fc2cd70bb..199f2a01771b70a45af16f9989fc746fa8f1db0b 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -21,7 +21,7 @@
},
'conditions': [
- ['enable_remoting_host==1', {
+ ['enable_remoting_host==1 or enable_it2me_chromeos==1', {
Sergey Ulanov 2014/09/06 02:03:25 I think ideally we want to have enable_remoting_m
kelvinp 2014/09/09 21:19:47 Done.
'targets': [
{
'target_name': 'remoting_host',
@@ -64,6 +64,8 @@
'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',
@@ -285,7 +287,7 @@
'host/win/wts_terminal_observer.h',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" and chromeos=="0"', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk',
@@ -302,6 +304,27 @@
],
},
}],
+ ['chromeos==1', {
+ 'dependencies' : [
+ '../skia/skia.gyp:skia',
+ ],
+ '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',
@@ -800,7 +823,7 @@
'host/it2me/it2me_native_messaging_host_main.h',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" and chromeos=="0"', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk',

Powered by Google App Engine
This is Rietveld 408576698