diff options
| author | 2020-09-24 09:52:22 +0000 | |
|---|---|---|
| committer | 2020-09-24 09:52:22 +0000 | |
| commit | 0a8d8cafa16ead1b59079d63f3c4a90dd980ac32 (patch) | |
| tree | e84719f3b6c82ed3f9e9076b4cc1301bc2225894 | |
| parent | a788fea989d5d3f858088dd32e49d3060f863af9 (diff) | |
| parent | 2b79bd6e27f8c0049d831fc2b025ed84facdf0f7 (diff) | |
Merge "Remove unused testutils lib from tethering tests" am: 5fad8b26e0 am: b16646a949 am: a63fbe8200 am: 2b79bd6e27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: I6f7ded717faf6e801102e37863ff9477dde47c8a
| -rw-r--r-- | packages/Tethering/tests/integration/Android.bp | 1 | ||||
| -rw-r--r-- | packages/Tethering/tests/unit/jarjar-rules.txt | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/Tethering/tests/integration/Android.bp b/packages/Tethering/tests/integration/Android.bp index ed69b7d63cb4..02bab9ba353e 100644 --- a/packages/Tethering/tests/integration/Android.bp +++ b/packages/Tethering/tests/integration/Android.bp @@ -22,7 +22,6 @@ java_defaults { static_libs: [ "NetworkStackApiStableLib", "androidx.test.rules", - "frameworks-base-testutils", "mockito-target-extended-minus-junit4", "net-tests-utils", "testables", diff --git a/packages/Tethering/tests/unit/jarjar-rules.txt b/packages/Tethering/tests/unit/jarjar-rules.txt index ec2d2b02004e..7ed89632a861 100644 --- a/packages/Tethering/tests/unit/jarjar-rules.txt +++ b/packages/Tethering/tests/unit/jarjar-rules.txt @@ -9,3 +9,8 @@ rule com.android.internal.util.StateMachine* com.android.networkstack.tethering. rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1 rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1 + +# TODO: either stop using frameworks-base-testutils or remove the unit test classes it contains. +# TestableLooper from "testables" can be used instead of TestLooper from frameworks-base-testutils. +zap android.os.test.TestLooperTest* +zap com.android.test.filters.SelectTestTests*
\ No newline at end of file |