| 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 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 "//content/public/android:content_java", | 452 "//content/public/android:content_java", |
| 453 "//content/public/test/android:content_java_test_support", | 453 "//content/public/test/android:content_java_test_support", |
| 454 "//third_party/android_tools:android_support_v13_java", | 454 "//third_party/android_tools:android_support_v13_java", |
| 455 "//third_party/android_tools:android_support_v7_appcompat_java", | 455 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 456 "//ui/android:ui_java", | 456 "//ui/android:ui_java", |
| 457 ] | 457 ] |
| 458 DEPRECATED_java_in_dir = "shell/javatests/src" | 458 DEPRECATED_java_in_dir = "shell/javatests/src" |
| 459 } | 459 } |
| 460 | 460 |
| 461 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk | 461 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk |
| 462 android_apk("chrome_shell_test_apk") { | 462 instrumentation_test_apk("chrome_shell_test_apk") { |
| 463 testonly = true | |
| 464 apk_under_test = ":chrome_shell_apk" | 463 apk_under_test = ":chrome_shell_apk" |
| 465 deps = [ | 464 deps = [ |
| 466 ":chrome_javatests", | 465 ":chrome_javatests", |
| 467 ":chrome_shell_test_java", | 466 ":chrome_shell_test_java", |
| 468 "//sync/android:sync_javatests", | 467 "//sync/android:sync_javatests", |
| 469 "//testing/android/broker:broker_java", | |
| 470 "//ui/android:ui_javatests", | 468 "//ui/android:ui_javatests", |
| 471 ] | 469 ] |
| 472 data_deps = [ "//testing/android/driver:driver_apk" ] | |
| 473 apk_name = "ChromeShellTest" | 470 apk_name = "ChromeShellTest" |
| 474 android_manifest = "shell/javatests/AndroidManifest.xml" | 471 android_manifest = "shell/javatests/AndroidManifest.xml" |
| 472 isolate_file = "../chrome_shell_test_apk.isolate" |
| 475 } | 473 } |
| 476 | 474 |
| 477 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests | 475 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests |
| 478 junit_binary("chrome_junit_tests") { | 476 junit_binary("chrome_junit_tests") { |
| 479 java_files = [ | 477 java_files = [ |
| 480 "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.ja
va", | 478 "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.ja
va", |
| 481 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", | 479 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", |
| 482 "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteContro
llerTest.java", | 480 "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteContro
llerTest.java", |
| 483 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", | 481 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav
a", |
| 484 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", | 482 "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java
", |
| 485 "junit/src/org/chromium/chrome/browser/media/remote/TransportControlTest.jav
a", | 483 "junit/src/org/chromium/chrome/browser/media/remote/TransportControlTest.jav
a", |
| 486 ] | 484 ] |
| 487 deps = [ | 485 deps = [ |
| 488 ":chrome_java", | 486 ":chrome_java", |
| 489 "//base:base_java", | 487 "//base:base_java", |
| 490 "//base:base_java_test_support", | 488 "//base:base_java_test_support", |
| 491 "//third_party/junit:hamcrest", | 489 "//third_party/junit:hamcrest", |
| 492 "//third_party/android_tools:android_support_v7_mediarouter_java", | 490 "//third_party/android_tools:android_support_v7_mediarouter_java", |
| 493 ] | 491 ] |
| 494 } | 492 } |
| 495 | 493 |
| 496 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk | 494 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk |
| 497 if (false) { | 495 if (false) { |
| 498 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
orted. | 496 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
orted. |
| 499 # crbug.com/475612 | 497 # crbug.com/475612 |
| 500 android_apk("chrome_sync_shell_test_apk") { | 498 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
| 501 apk_under_test = ":chrome_sync_shell_apk" | 499 apk_under_test = ":chrome_sync_shell_apk" |
| 502 testonly = true | |
| 503 deps = [ | 500 deps = [ |
| 504 ":chrome_java", | 501 ":chrome_java", |
| 505 ":chrome_shell_java", | 502 ":chrome_shell_java", |
| 506 ":chrome_shell_test_java", | 503 ":chrome_shell_test_java", |
| 507 "//base:base_java", | 504 "//base:base_java", |
| 508 "//base:base_java_test_support", | 505 "//base:base_java_test_support", |
| 509 "//chrome/test/android:chrome_java_test_support", | 506 "//chrome/test/android:chrome_java_test_support", |
| 510 "//components/invalidation:java", | 507 "//components/invalidation:java", |
| 511 "//content/public/android:content_java", | 508 "//content/public/android:content_java", |
| 512 "//content/public/test/android:content_java_test_support", | 509 "//content/public/test/android:content_java_test_support", |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 | 819 |
| 823 # TODO(GYP,cjhopman): Does this need version code/name? | 820 # TODO(GYP,cjhopman): Does this need version code/name? |
| 824 apk_name = "ChromePublicTest" | 821 apk_name = "ChromePublicTest" |
| 825 apk_under_test = ":chrome_public_apk" | 822 apk_under_test = ":chrome_public_apk" |
| 826 android_manifest = chrome_public_test_apk_manifest | 823 android_manifest = chrome_public_test_apk_manifest |
| 827 deps = [ | 824 deps = [ |
| 828 "//chrome/test/android:chrome_staging_test_support_java", | 825 "//chrome/test/android:chrome_staging_test_support_java", |
| 829 "//chrome/android:chrome_staging_test_java", | 826 "//chrome/android:chrome_staging_test_java", |
| 830 ] | 827 ] |
| 831 } | 828 } |
| OLD | NEW |