From 4b0281b50efed3b745effb7a7a388131203676f8 Mon Sep 17 00:00:00 2001
From: Michael Plass <mplass@google.com>
Date: Fri, 26 Jan 2018 10:30:03 -0800
Subject: downgrade wifi unit tests to mockito 2.12

This reverts commit be4c1b210d4a3452d235ed6734f673d218e35317.

Bug: 72052158
Bug: 72526177
Test: Unit tests
Change-Id: Ic20dc29f1be6975da85fc83d7c92c62d446c2ea4
---
 tests/wifitests/Android.mk          | 3 +--
 tests/wifitests/AndroidManifest.xml | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index 7c2e16f6f..3b0aab96f 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -59,7 +59,7 @@ LOCAL_JACK_FLAGS := --multi-dex native
 # since neither is declared a static java library.
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	android-support-test \
-	mockito-target-inline-minus-junit4 \
+	mockito-target-minus-junit4 \
 	frameworks-base-testutils \
 	services \
 	wifi-service \
@@ -108,7 +108,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \
 	libunwindstack \
 	libutils \
 	libvndksupport \
-	libdexmakerjvmtiagent \
 
 ifdef WPA_SUPPLICANT_VERSION
 LOCAL_JNI_SHARED_LIBRARIES += libwpa_client
diff --git a/tests/wifitests/AndroidManifest.xml b/tests/wifitests/AndroidManifest.xml
index 31eaac900..dcb61c740 100644
--- a/tests/wifitests/AndroidManifest.xml
+++ b/tests/wifitests/AndroidManifest.xml
@@ -19,9 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.server.wifi.test">
 
-    <application
-        android:debuggable="true"
-        android:largeHeap="true">
+    <application>
         <uses-library android:name="android.test.runner" />
         <activity android:label="WifiTestDummyLabel"
                   android:name="WifiTestDummyName">
-- 
cgit v1.2.3