commit f1702e91bd3597627e187d27f18abf8db3e317c3
author tadvana <tadvana@google.com> Thu Aug 08 15:17:28 2019 -0700
committer tadvana <tadvana@google.com> Thu Aug 08 15:21:13 2019 -0700
tree 8eee114a225b59629cffae7499d33d645e039eb0
parent 11aa635ce036ba8f7f77f141c7ec039fdb4e3995

Remove Mockito from static libs in android.car.testapi

Having Mockito as a static lib in the testapi can cause it to conflict
with a local version of Mockito. Have mockito load dynamically instead
and use the local version of Mockito in the classpath of the app using
the testapi library.

Test: . build/envsetup.sh && lunch hawk-userdebug
make -jN RunCarLibTests

Change-Id: I9941b881a7f5bcd9b286bf483e79bca6da956442

car-test-lib/Android.bp

diff --git a/car-test-lib/Android.bp b/car-test-lib/Android.bp
index aaa9138..e4282b0 100644
--- a/car-test-lib/Android.bp
+++ b/car-test-lib/Android.bp
@@ -25,6 +25,8 @@
     static_libs: [
         "android.car",
         "car-service-lib-for-test",
+    ],
+    libs: [
         "mockito",
     ],
     installable: false,