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

Unified Diff: content/shell/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 | « content/content_tests.gypi ('k') | media/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/BUILD.gn
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 8af8c29d44e29ca5c47b78a4eb3da5bb1c262cae..a30af3a0db532547b19a43c0882d23957d035cd6 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -149,21 +149,17 @@ android_library("content_shell_test_java") {
DEPRECATED_java_in_dir = "javatests/src"
}
-android_apk("content_shell_test_apk") {
- testonly = true
+instrumentation_test_apk("content_shell_test_apk") {
deps = [
"//content/public/android:content_javatests",
"//base:base_javatests",
"//net/android:net_javatests",
- "//testing/android/broker:broker_java",
- ]
- data_deps = [
- ":content_shell_apk",
- "//testing/android/driver:driver_apk",
]
+ data_deps = [ ":content_shell_apk" ]
apk_under_test = ":content_shell_apk"
apk_name = "ContentShellTest"
android_manifest = "javatests/AndroidManifest.xml"
+ isolate_file = "../../content_shell_test_apk.isolate"
}
if (current_cpu != "x64" && current_cpu != "arm64") {
« no previous file with comments | « content/content_tests.gypi ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698