| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 ] | 59 ] |
| 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. | |
| 70 if (enable_nacl) { | 69 if (enable_nacl) { |
| 71 deps += [ "//remoting:remoting_key_tester" ] | 70 deps += [ "//remoting/tools/javascript_key_tester" ] |
| 72 } | 71 } |
| 73 } | 72 } |
| 74 | 73 |
| 75 # GYP version: remoting/remoting_test.gypi:remoting_test_support | 74 # GYP version: remoting/remoting_test.gypi:remoting_test_support |
| 76 source_set("test_support") { | 75 source_set("test_support") { |
| 77 testonly = true | 76 testonly = true |
| 78 | 77 |
| 79 deps = [ | 78 deps = [ |
| 80 "//base", | 79 "//base", |
| 81 "//net", | 80 "//net", |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 182 |
| 184 if (enable_webrtc) { | 183 if (enable_webrtc) { |
| 185 deps += [ "//third_party/libjingle:libjingle_webrtc" ] | 184 deps += [ "//third_party/libjingle:libjingle_webrtc" ] |
| 186 } | 185 } |
| 187 } | 186 } |
| 188 } | 187 } |
| 189 } else { | 188 } else { |
| 190 group("remoting_unittests") { | 189 group("remoting_unittests") { |
| 191 } | 190 } |
| 192 } | 191 } |
| 193 | |
| 194 if (enable_pnacl) { | |
| 195 group("remoting_key_tester") { | |
| 196 deps = [ | |
| 197 ":remoting_key_tester_copies", | |
| 198 ] | |
| 199 } | |
| 200 | |
| 201 copy("remoting_key_tester_copies") { | |
| 202 sources = [ | |
| 203 "tools/javascript_key_tester/background.js", | |
| 204 "tools/javascript_key_tester/chord_tracker.js", | |
| 205 "tools/javascript_key_tester/event_listeners.js", | |
| 206 "tools/javascript_key_tester/icon_128.png", | |
| 207 "tools/javascript_key_tester/main.css", | |
| 208 "tools/javascript_key_tester/main.html", | |
| 209 "tools/javascript_key_tester/main.js", | |
| 210 "tools/javascript_key_tester/manifest.json", | |
| 211 "tools/javascript_key_tester/pnacl/remoting_key_tester.nmf", | |
| 212 | |
| 213 # TODO(GYP): crbug.com/471924 "$target_out_dir/remoting_key_tester_newlib.
pexe", | |
| 214 ] | |
| 215 | |
| 216 outputs = [ | |
| 217 "$target_out_dir/remoting/key_tester/{{source_file_part}}", | |
| 218 ] | |
| 219 | |
| 220 deps = [ | |
| 221 ":remoting_key_tester_jscompile", | |
| 222 ":remoting_key_tester_pexe", | |
| 223 ] | |
| 224 } | |
| 225 | |
| 226 group("remoting_key_tester_jscompile") { | |
| 227 # TODO(GYP): crbug.com/471926 add support for run_jscompile=true. | |
| 228 run_jscompile = false | |
| 229 if (run_jscompile) { | |
| 230 } | |
| 231 } | |
| 232 | |
| 233 group("remoting_key_tester_pexe") { | |
| 234 # TODO(GYP): crbug.com/471924 implement me when we have a pnacl toolchain. | |
| 235 #sources = [ | |
| 236 # "tools/javascript_key_tester/pnacl/remoting_key_tester.cc", | |
| 237 #] | |
| 238 } | |
| 239 } | |
| OLD | NEW |