summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.extras.bp6
-rw-r--r--test_runner/Android.bp10
2 files changed, 5 insertions, 11 deletions
diff --git a/Android.extras.bp b/Android.extras.bp
index 5fe86ae3f..4b173352e 100644
--- a/Android.extras.bp
+++ b/Android.extras.bp
@@ -144,10 +144,6 @@ java_defaults {
"androidx.annotation_annotation",
"junit",
],
- test_suites: [
- "general-tests",
- "mts-tethering",
- ],
}
filegroup {
@@ -252,7 +248,7 @@ android_test_helper_app {
static_libs: ["cronet_for_testing_net_java"],
resource_dirs : [
"net/android/unittest_support/res",
- ]
+ ],
}
// ------------------------------ JAVA TEST TARGETS --------------------------------------------
diff --git a/test_runner/Android.bp b/test_runner/Android.bp
index 8bba94abc..ed1f6f387 100644
--- a/test_runner/Android.bp
+++ b/test_runner/Android.bp
@@ -30,10 +30,8 @@ java_test_host {
"tradefed",
"framework-annotations-lib",
],
- required: [
- "cronet_net_tester_app",
- ],
data: [
+ ":cronet_net_tester_app",
":net_unittests_data",
],
test_suites: [
@@ -59,9 +57,6 @@ java_test_host {
"tradefed",
"framework-annotations-lib",
],
- required: [
- "cronet_tester_app",
- ],
test_suites: [
"general-tests",
"mts-tethering",
@@ -74,4 +69,7 @@ java_test_host {
enabled: false,
},
},
+ data: [
+ ":cronet_tester_app",
+ ],
}