diff options
| author | Mohannad Farrag <aymanm@google.com> | 2023-11-02 20:32:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-02 20:32:19 +0000 |
| commit | 141cc6db27353fd1132bcb7bf527de23f2314432 (patch) | |
| tree | 2e24d3ecd5312bc54e5db47c72a70c223855538c | |
| parent | b40e0848fe97988f6ff1fcd200117d01330ecd39 (diff) | |
| parent | 5647d8d8ace54b5fcd7e2c5e4e12ab5270fa3fb0 (diff) | |
| download | cronet-141cc6db27353fd1132bcb7bf527de23f2314432.tar.gz | |
Revert^2 "Include module dependencies under `data`" am: 3d84551f57 am: 5647d8d8ac
Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2815953
Change-Id: I39d6c74029d867748a45ecbe3249d4120f1c7d43
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", + ], } |