Revert "Use mockito-extended in FrameworksNetTests"
This reverts commit 98b76cc2ec58396c804a4e4f658c915b3c80c138.
Reason for revert: <INSERT REASONING HERE>
b/190622577
Change-Id: Ief39f82875e6fa885829aea62eed00f2f2e6774e
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index ad59c94..9a0c422 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -59,17 +59,16 @@
static_libs: [
"androidx.test.rules",
"bouncycastle-repackaged-unbundled",
+ "FrameworksNetCommonTests",
"frameworks-base-testutils",
"frameworks-net-integration-testutils",
"framework-protos",
- "mockito-target-extended-minus-junit4",
+ "mockito-target-minus-junit4",
"net-tests-utils",
"platform-test-annotations",
"service-connectivity-pre-jarjar",
"services.core",
"services.net",
- // At the bottom to prefer test libraries above instead of those in the common tests
- "FrameworksNetCommonTests",
],
libs: [
"android.net.ipsec.ike.stubs.module_lib",
@@ -79,9 +78,6 @@
"ServiceConnectivityResources",
],
jni_libs: [
- // For mockito extended
- "libdexmakerjvmtiagent",
- "libstaticjvmtiagent",
"libservice-connectivity",
],
}