OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//remoting/remoting_version.gni") | 7 import("//remoting/remoting_version.gni") |
8 import("//remoting/remoting_enable.gni") | 8 import("//remoting/remoting_enable.gni") |
9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
10 | 10 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
68 # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl. | 68 # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl. |
69 if (enable_nacl) { | 69 if (enable_nacl) { |
70 deps += [ "//remoting:remoting_key_tester" ] | 70 deps += [ "//remoting:remoting_key_tester" ] |
71 } | 71 } |
72 } | 72 } |
73 | 73 |
74 # GYP version: remoting/remoting_test.gypi:remoting_test_support | 74 # GYP version: remoting/remoting_test.gypi:remoting_test_support |
75 source_set("test_support") { | 75 source_set("test_support") { |
76 testonly = true | 76 testonly = true |
77 | 77 |
78 sources = [ | |
Sergey Ulanov
2015/07/16 23:42:09
This looks like a failed merge.
You want to add c
tonychun
2015/07/17 16:25:49
Done.
| |
79 # Files from remoting_test_common not in separate test_support targets. | |
joedow
2015/07/16 23:26:33
Please fix this merge issue (sergey removed this s
tonychun
2015/07/17 16:25:49
Done.
| |
80 "signaling/fake_signal_strategy.cc", | |
81 "signaling/fake_signal_strategy.h", | |
82 "signaling/mock_signal_strategy.cc", | |
83 "signaling/mock_signal_strategy.h", | |
84 "test/access_token_fetcher.cc", | |
85 "test/access_token_fetcher.h", | |
86 "test/app_remoting_report_issue_request.cc", | |
87 "test/app_remoting_report_issue_request.h", | |
88 "test/app_remoting_service_urls.cc", | |
89 "test/app_remoting_service_urls.h", | |
90 "test/app_remoting_test_driver_environment.cc", | |
91 "test/app_remoting_test_driver_environment.h", | |
92 "test/app_remoting_test_driver_environment_app_details.cc", | |
93 "test/connection_setup_info.cc", | |
94 "test/connection_setup_info.h", | |
95 "test/fake_access_token_fetcher.cc", | |
96 "test/fake_access_token_fetcher.h", | |
97 "test/fake_app_remoting_report_issue_request.cc", | |
98 "test/fake_app_remoting_report_issue_request.h", | |
99 "test/fake_network_dispatcher.cc", | |
100 "test/fake_network_dispatcher.h", | |
101 "test/fake_network_manager.cc", | |
102 "test/fake_network_manager.h", | |
103 "test/fake_port_allocator.cc", | |
104 "test/fake_port_allocator.h", | |
105 "test/fake_remote_host_info_fetcher.cc", | |
106 "test/fake_remote_host_info_fetcher.h", | |
107 "test/fake_socket_factory.cc", | |
108 "test/fake_socket_factory.h", | |
109 "test/host_info.cc", | |
110 "test/host_info.h", | |
111 "test/host_list_fetcher.cc", | |
112 "test/host_list_fetcher.h", | |
113 "test/leaky_bucket.cc", | |
114 "test/leaky_bucket.h", | |
115 "test/mock_access_token_fetcher.cc", | |
116 "test/mock_access_token_fetcher.h", | |
117 "test/refresh_token_store.cc", | |
118 "test/refresh_token_store.h", | |
119 "test/remote_application_details.h", | |
120 "test/remote_connection_observer.h", | |
121 "test/remote_host_info.cc", | |
122 "test/remote_host_info.h", | |
123 "test/remote_host_info_fetcher.cc", | |
124 "test/remote_host_info_fetcher.h", | |
125 "test/test_chromoting_client.cc", | |
126 "test/test_chromoting_client.h", | |
127 "test/test_video_renderer.cc", | |
128 "test/test_video_renderer.h", | |
129 ] | |
130 | |
78 deps = [ | 131 deps = [ |
79 "//base", | 132 "//base", |
80 "//net", | 133 "//net", |
81 "//remoting/base", | 134 "//remoting/base", |
82 "//remoting/client", | 135 "//remoting/client", |
83 "//remoting/codec", | 136 "//remoting/codec", |
84 "//remoting/protocol:test_support", | 137 "//remoting/protocol:test_support", |
85 "//remoting/resources", | 138 "//remoting/resources", |
86 "//remoting/signaling:test_support", | 139 "//remoting/signaling:test_support", |
87 "//remoting/test:test_support", | 140 "//remoting/test:test_support", |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
214 } | 267 } |
215 } | 268 } |
216 | 269 |
217 group("remoting_key_tester_pexe") { | 270 group("remoting_key_tester_pexe") { |
218 # TODO(GYP): crbug.com/471924 implement me when we have a pnacl toolchain. | 271 # TODO(GYP): crbug.com/471924 implement me when we have a pnacl toolchain. |
219 #sources = [ | 272 #sources = [ |
220 # "tools/javascript_key_tester/pnacl/remoting_key_tester.cc", | 273 # "tools/javascript_key_tester/pnacl/remoting_key_tester.cc", |
221 #] | 274 #] |
222 } | 275 } |
223 } | 276 } |
OLD | NEW |