commit cb822ae902bacd328bbf5c36de6e3954fc12af4b
author Tom Taylor <tomtaylor@google.com> Wed Jul 12 19:28:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 12 19:28:15 2017 +0000
tree 09bd4b880fd1be7dd8c6a21fc6659c7b46c0abf9
parent eaa925147a2b2c5696084a1a6d154b95a6d99d9b
parent 7ace2d5308939c159ade2129c702a5fd856e88b3

37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012
am: 7ace2d5308

Change-Id: I1872889b944cdffa63bafd7a125315d2fe2d7917

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)