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("//build/util/version.gni") | 7 import("//build/util/version.gni") |
8 import("//remoting/remoting_version.gni") | 8 import("//remoting/remoting_version.gni") |
9 import("//remoting/remoting_enable.gni") | 9 import("//remoting/remoting_enable.gni") |
10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 } | 60 } |
61 | 61 |
62 if (enable_me2me_host) { | 62 if (enable_me2me_host) { |
63 deps += [ | 63 deps += [ |
64 "//remoting/host:remoting_me2me_host", | 64 "//remoting/host:remoting_me2me_host", |
65 #"//remoting/host:remoting_me2me_host_archive", | 65 #"//remoting/host:remoting_me2me_host_archive", |
66 ] | 66 ] |
67 } | 67 } |
68 | 68 |
69 # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl. | 69 # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl. |
70 if (enable_nacl) { | 70 if (enable_pnacl) { |
71 deps += [ "//remoting:remoting_key_tester" ] | 71 deps += [ "//remoting:remoting_key_tester" ] |
72 } | 72 } |
73 } | 73 } |
74 | 74 |
75 # GYP version: remoting/remoting_test.gypi:remoting_test_support | 75 # GYP version: remoting/remoting_test.gypi:remoting_test_support |
76 source_set("test_support") { | 76 source_set("test_support") { |
77 testonly = true | 77 testonly = true |
78 | 78 |
79 deps = [ | 79 deps = [ |
80 "//base", | 80 "//base", |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
184 if (enable_webrtc) { | 184 if (enable_webrtc) { |
185 deps += [ "//third_party/libjingle:libjingle_webrtc" ] | 185 deps += [ "//third_party/libjingle:libjingle_webrtc" ] |
186 } | 186 } |
187 } | 187 } |
188 } | 188 } |
189 } else { | 189 } else { |
190 group("remoting_unittests") { | 190 group("remoting_unittests") { |
191 } | 191 } |
192 } | 192 } |
193 | 193 |
194 if (enable_pnacl) { | 194 if (enable_pnacl) { |
Peter Mayo
2015/09/03 20:54:44
Note conditional here.
| |
195 group("remoting_key_tester") { | 195 group("remoting_key_tester") { |
196 deps = [ | 196 deps = [ |
197 ":remoting_key_tester_copies", | 197 ":remoting_key_tester_copies", |
198 ] | 198 ] |
199 } | 199 } |
200 | 200 |
201 copy("remoting_key_tester_copies") { | 201 copy("remoting_key_tester_copies") { |
202 sources = [ | 202 sources = [ |
203 "tools/javascript_key_tester/background.js", | 203 "tools/javascript_key_tester/background.js", |
204 "tools/javascript_key_tester/chord_tracker.js", | 204 "tools/javascript_key_tester/chord_tracker.js", |
(...skipping 25 matching lines...) Expand all Loading... | |
230 } | 230 } |
231 } | 231 } |
232 | 232 |
233 group("remoting_key_tester_pexe") { | 233 group("remoting_key_tester_pexe") { |
234 # TODO(GYP): crbug.com/471924 implement me when we have a pnacl toolchain. | 234 # TODO(GYP): crbug.com/471924 implement me when we have a pnacl toolchain. |
235 #sources = [ | 235 #sources = [ |
236 # "tools/javascript_key_tester/pnacl/remoting_key_tester.cc", | 236 # "tools/javascript_key_tester/pnacl/remoting_key_tester.cc", |
237 #] | 237 #] |
238 } | 238 } |
239 } | 239 } |
OLD | NEW |