Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: chrome/android/BUILD.gn

Issue 1120883002: [Android] Generate scripts at build time to run android tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed datadeps to data_deps to reflect recent change. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/BUILD.gn ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 1a80141e23f93a16aed96602b24999f47f401f48..a4334e75a32b2128bad63517d1051e05f32ed182 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -459,19 +459,17 @@ android_library("chrome_shell_test_java") {
}
# GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk
-android_apk("chrome_shell_test_apk") {
- testonly = true
+instrumentation_test_apk("chrome_shell_test_apk") {
apk_under_test = ":chrome_shell_apk"
deps = [
":chrome_javatests",
":chrome_shell_test_java",
"//sync/android:sync_javatests",
- "//testing/android/broker:broker_java",
"//ui/android:ui_javatests",
]
- data_deps = [ "//testing/android/driver:driver_apk" ]
apk_name = "ChromeShellTest"
android_manifest = "shell/javatests/AndroidManifest.xml"
+ isolate_file = "../chrome_shell_test_apk.isolate"
}
# GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
@@ -497,9 +495,8 @@ junit_binary("chrome_junit_tests") {
if (false) {
# TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be ported.
# crbug.com/475612
- android_apk("chrome_sync_shell_test_apk") {
+ instrumentation_test_apk("chrome_sync_shell_test_apk") {
apk_under_test = ":chrome_sync_shell_apk"
- testonly = true
deps = [
":chrome_java",
":chrome_shell_java",
« no previous file with comments | « cc/BUILD.gn ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698