diff options
| author | jahinimtiaz <jahinimtiaz@google.com> | 2023-10-19 15:25:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-19 15:25:57 +0000 |
| commit | e1b614c72ed3ae39309414703c3ad9599016b3be (patch) | |
| tree | 2e24d3ecd5312bc54e5db47c72a70c223855538c | |
| parent | 5d54ab7343da850127d096f43173015fd43f2356 (diff) | |
| parent | f89bf9390017310f452c1d39c5da044e3b27462e (diff) | |
| download | cronet-e1b614c72ed3ae39309414703c3ad9599016b3be.tar.gz | |
Include module dependencies under `data` am: f89bf93900
Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2796119
Change-Id: Id89bcbed309682b49b3be7957ca0cb448fc78b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.extras.bp | 6 | ||||
| -rw-r--r-- | test_runner/Android.bp | 10 |
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", + ], } |