commit 14de8b7809e3ad06571599c35e9dd60e0fa7d803
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 29 01:16:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 01:16:32 2019 +0000
tree 31ff654648e1e61609316ac1f4edf9d199ba6e91
parent 89fcf9c79387023da1e49394ce74c3b46a084f9c
parent a3d3bed7aa210ef0b8c3cab7b8e7ff205d787522

Merge "Update to use inline Mockito so we can mock Final class" into qt-dev

tests/carservice_unit_test/Android.mk

diff --git a/tests/carservice_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index b15dd41..3267fa6 100644
--- a/tests/carservice_unit_test/Android.mk
+++ b/tests/carservice_unit_test/Android.mk
@@ -53,9 +53,12 @@
     car-service-lib-for-test \
     com.android.car.test.utils \
     junit \
-    mockito-target-minus-junit4 \
+    mockito-target-inline-minus-junit4 \
     frameworks-base-testutils \
     truth-prebuilt
 
+LOCAL_JNI_SHARED_LIBRARIES := \
+    # mockito-target-inline dependency \
+    libdexmakerjvmtiagent \
 
 include $(BUILD_PACKAGE)

tests/carservice_unit_test/AndroidManifest.xml

diff --git a/tests/carservice_unit_test/AndroidManifest.xml b/tests/carservice_unit_test/AndroidManifest.xml
index 74f6aa1..e5e31bf 100644
--- a/tests/carservice_unit_test/AndroidManifest.xml
+++ b/tests/carservice_unit_test/AndroidManifest.xml
@@ -22,7 +22,8 @@
             android:targetPackage="com.android.car.carservice_unittest"
             android:label="Unit Tests for Car APIs"/>
 
-    <application android:label="CarServiceUnitTest">
+    <application android:label="CarServiceUnitTest"
+            android:debuggable="true">
         <uses-library android:name="android.test.runner" />
     </application>
 </manifest>