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

Issues Search
    My Issues | Starred     Open | Closed | All

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
« remoting/host/chromeos/aura_desktop_capturer_unittest.cc ('K') | « remoting/host/chromeos/aura_desktop_capturer_unittest.cc ('k') | remoting/remoting_test.gypi » ('j') | 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 e387e93e7e2b31e121d91c66a8a98f2fc2cd70bb..679a8254185804cbad86bec34771b77ba40d0794 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -12,11 +12,19 @@
'variables': {
'conditions': [
# Remoting host is supported only on Windows, OSX and Linux (with X11).
- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
+ ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
+ 'enable_me2me_host': 1,
+ 'enable_it2me_host': 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,
James Cook 2014/09/11 15:52:34 Does this section need an entry for enable_remotin
kelvinp 2014/09/11 20:54:17 No, the condition above should already set enable_
+ }],
],
},
@@ -64,6 +72,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',
@@ -287,8 +297,6 @@
'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',
@@ -302,6 +310,37 @@
],
},
}],
+ ['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',
+ ],
+ "dependencies" : [
+ # Always use GTK on Linux, even for Aura builds.
+ '../build/linux/system.gyp:gtk',
+ ]
+ }],
['OS=="mac"', {
'dependencies': [
'../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
@@ -398,40 +437,6 @@
}, # 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, },
@@ -481,30 +486,6 @@
],
}, # 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',
@@ -599,7 +580,73 @@
], # end of 'targets'
}], # 'enable_remoting_host==1'
- ['OS!="win" and 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', {
'targets': [
{
'target_name': 'remoting_me2me_host',
@@ -777,6 +824,11 @@
}], # 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',
@@ -800,7 +852,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',
@@ -872,7 +924,7 @@
],
}, # end of target 'remoting_it2me_native_messaging_host'
], # end of 'targets'
- }], # OS!="win"
+ }], # # end of OS!="win" and enable_it2me_host==1
], # end of 'conditions'
}
« remoting/host/chromeos/aura_desktop_capturer_unittest.cc ('K') | « remoting/host/chromeos/aura_desktop_capturer_unittest.cc ('k') | remoting/remoting_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698