summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_host.gypi
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2015-02-27 15:41:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-27 23:41:58 +0000
commitd593eac9968cee2b5412ba22638ed16f0884c408 (patch)
tree4b9141e61f879d7e7b226a6d250c72de847e65d6 /remoting/remoting_host.gypi
parent77b5872e9a7181afcc3b59881af5218a0d42ea7b (diff)
downloadchromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.zip
chromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.tar.gz
chromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.tar.bz2
Revert of Add remoting and PPAPI tests to GN build (patchset #7 id:120001 of https://codereview.chromium.org/965633002/)
Reason for revert: http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%20GN&number=4498 ERROR at //remoting/host/BUILD.gn:56:7: Item not found "linux/x_server_clipboard.cc", ^---------------------------- You were trying to remove "linux/x_server_clipboard.cc" Original issue's description: > Add remoting and PPAPI tests to GN build > > BUG= > > Committed: https://crrev.com/d0437210926b14b1b7e06b2b56174fc92ade9c37 > Cr-Commit-Position: refs/heads/master@{#318539} TBR=kelvinp@chromium.org,dpranke@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/970443002 Cr-Commit-Position: refs/heads/master@{#318545}
Diffstat (limited to 'remoting/remoting_host.gypi')
-rw-r--r--remoting/remoting_host.gypi34
1 files changed, 30 insertions, 4 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index 8978ffc..e818a97 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -211,7 +211,6 @@
}, # end of target 'remoting_host'
{
- # GN version: //remoting/host/native_messaging
'target_name': 'remoting_native_messaging_base',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
@@ -219,12 +218,18 @@
'../base/base.gyp:base',
],
'sources': [
- '<@(remoting_host_native_messaging_sources)',
+ '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',
+ 'host/native_messaging/native_messaging_writer.h',
+ 'host/native_messaging/pipe_messaging_channel.cc',
+ 'host/native_messaging/pipe_messaging_channel.h',
],
}, # end of target 'remoting_native_messaging_base'
{
- # GN version: //remoting/host/setup
'target_name': 'remoting_host_setup_base',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
@@ -237,7 +242,28 @@
'VERSION=<(version_full)',
],
'sources': [
- '<@(remoting_host_setup_sources)',
+ 'host/setup/daemon_controller.cc',
+ 'host/setup/daemon_controller.h',
+ 'host/setup/daemon_controller_delegate_linux.cc',
+ 'host/setup/daemon_controller_delegate_linux.h',
+ 'host/setup/daemon_controller_delegate_mac.h',
+ 'host/setup/daemon_controller_delegate_mac.mm',
+ 'host/setup/daemon_controller_delegate_win.cc',
+ 'host/setup/daemon_controller_delegate_win.h',
+ 'host/setup/me2me_native_messaging_host.cc',
+ 'host/setup/me2me_native_messaging_host.h',
+ 'host/setup/oauth_client.cc',
+ 'host/setup/oauth_client.h',
+ 'host/setup/oauth_helper.cc',
+ 'host/setup/oauth_helper.h',
+ 'host/setup/pin_validator.cc',
+ 'host/setup/pin_validator.h',
+ 'host/setup/service_client.cc',
+ 'host/setup/service_client.h',
+ 'host/setup/test_util.cc',
+ 'host/setup/test_util.h',
+ 'host/setup/win/auth_code_getter.cc',
+ 'host/setup/win/auth_code_getter.h',
],
'conditions': [
['OS=="win"', {