commit 8f2f5671b07933e3a2d48abf0ac1954e3ae934a9
author Atanas Kirilov <akirilov@google.com> Fri Jun 01 00:36:07 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 01 00:36:07 2018 -0700
tree b03102e4f822226f0deadac24d45aa4e6ded9930
parent 999910ca54f3058855ba7d2cb5bc1c35597c3673
parent 24fba8cf55cee4a40ee9729aad1874b3937e5311

Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87
am: 24fba8cf55

Change-Id: I77568438ff1c7b548256488f88f0291ab5780fd3

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index a8c13cd..a137a92 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -30,8 +30,9 @@
 LOCAL_CERTIFICATE := platform
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
-    legacy-android-test
+    mockito-target
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
 include $(BUILD_PACKAGE)