commit 999910ca54f3058855ba7d2cb5bc1c35597c3673
author David Smith <davidas@google.com> Fri Jun 01 00:35:46 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 01 00:35:46 2018 -0700
tree 09bd4b880fd1be7dd8c6a21fc6659c7b46c0abf9
parent b2dd6a8ef54b233843b463204ec4e3b67148a7e8
parent 26ae608af379535d41fd9a799eb0c545d43d8550

[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0
am: 26ae608af3

Change-Id: I4f4a114035b95e5bc3d25c1f825520fb4f0f0a70

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)