commit a8e68bb723f204898fffb4c3824174a3baac1be5
author Remi NGUYEN VAN <reminv@google.com> Thu Sep 24 08:16:21 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 24 08:16:21 2020 +0000
tree 290ea712d8ad59dfafa0c7c6840f9c0c91566c7c
parent 72e81859f8b7330482e37686225500b0a51ff074
parent 8f59ec090de7d7d2c852e8cee72ce49bd17d4ee5

Merge "Remove unused testutils lib from tethering tests"

Tethering/tests/integration/Android.bp

diff --git a/Tethering/tests/integration/Android.bp b/Tethering/tests/integration/Android.bp
index ed69b7d..02bab9b 100644
--- a/Tethering/tests/integration/Android.bp
+++ b/Tethering/tests/integration/Android.bp
@@ -22,7 +22,6 @@
     static_libs: [
         "NetworkStackApiStableLib",
         "androidx.test.rules",
-        "frameworks-base-testutils",
         "mockito-target-extended-minus-junit4",
         "net-tests-utils",
         "testables",

Tethering/tests/unit/jarjar-rules.txt

diff --git a/Tethering/tests/unit/jarjar-rules.txt b/Tethering/tests/unit/jarjar-rules.txt
index ec2d2b0..7ed8963 100644
--- a/Tethering/tests/unit/jarjar-rules.txt
+++ b/Tethering/tests/unit/jarjar-rules.txt
@@ -9,3 +9,8 @@
 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