diff options
| author | cpu <cpu@chromium.org> | 2015-03-02 14:27:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 22:28:26 +0000 |
| commit | defc80c0cd51186b467c3e59eabdbf54d25bde74 (patch) | |
| tree | 32d1c8d66f7e9f9aa7d6383553c42972a1939853 /remoting/remoting_host.gypi | |
| parent | c32b1cd854552259473c954c9204fe87426e540a (diff) | |
| download | chromium_src-defc80c0cd51186b467c3e59eabdbf54d25bde74.zip chromium_src-defc80c0cd51186b467c3e59eabdbf54d25bde74.tar.gz chromium_src-defc80c0cd51186b467c3e59eabdbf54d25bde74.tar.bz2 | |
Revert of Add remoting and PPAPI tests to GN build (patchset #6 id:100001 of https://codereview.chromium.org/961323004/)
Reason for revert:
broke windows GN builds as seen in
http://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/5206/steps/compile/logs/stdio
Original issue's description:
> Add remoting and PPAPI tests to GN build
>
> Reland of https://codereview.chromium.org/965633002/
>
> TBR=dpranke
>
> Committed: https://crrev.com/66c53eef76f7dff97b1bc76d51740c3a9c07844f
> Cr-Commit-Position: refs/heads/master@{#318756}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/968243004
Cr-Commit-Position: refs/heads/master@{#318772}
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 34 |
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"', { |