OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/android/config.gni") | 5 import("//build/config/android/config.gni") |
6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
10 import("//third_party/icu/config.gni") | 10 import("//third_party/icu/config.gni") |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 } | 449 } |
450 | 450 |
451 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk | 451 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk |
452 android_apk("chrome_shell_test_apk") { | 452 android_apk("chrome_shell_test_apk") { |
453 testonly = true | 453 testonly = true |
454 apk_under_test = ":chrome_shell_apk" | 454 apk_under_test = ":chrome_shell_apk" |
455 deps = [ | 455 deps = [ |
456 ":chrome_javatests", | 456 ":chrome_javatests", |
457 ":chrome_shell_test_java", | 457 ":chrome_shell_test_java", |
458 "//sync/android:sync_javatests", | 458 "//sync/android:sync_javatests", |
| 459 "//testing/android/broker:broker_java", |
459 "//ui/android:ui_javatests", | 460 "//ui/android:ui_javatests", |
460 ] | 461 ] |
| 462 datadeps = [ |
| 463 "//testing/android/driver:driver_apk", |
| 464 ] |
461 apk_name = "ChromeShellTest" | 465 apk_name = "ChromeShellTest" |
462 android_manifest = "shell/javatests/AndroidManifest.xml" | 466 android_manifest = "shell/javatests/AndroidManifest.xml" |
463 } | 467 } |
464 | 468 |
465 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests | 469 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests |
466 junit_binary("chrome_junit_tests") { | 470 junit_binary("chrome_junit_tests") { |
467 java_files = [ | 471 java_files = [ |
468 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", | 472 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", |
469 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", | 473 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", |
470 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", | 474 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
537 ] | 541 ] |
538 } | 542 } |
539 | 543 |
540 zip("chrome_version_srcjar") { | 544 zip("chrome_version_srcjar") { |
541 inputs = [ | 545 inputs = [ |
542 chrome_version_java_file, | 546 chrome_version_java_file, |
543 ] | 547 ] |
544 output = "$target_gen_dir/$target_name.srcjar" | 548 output = "$target_gen_dir/$target_name.srcjar" |
545 base_dir = chrome_version_java_dir | 549 base_dir = chrome_version_java_dir |
546 } | 550 } |
OLD | NEW |