commit d3136d870f9d4262d2aad2511c57a154a4c97156
author android-build-team Robot <android-build-team-robot@google.com> Sun Jun 18 07:35:52 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jun 18 07:35:52 2017 +0000
tree 373c2130b94ae0590653711f1629f291d5448166
parent 6bc6a55dbd7884e09bf5da177ecf214ef8f49bc0
parent 74e7b72337b040c26a374cb60695e78d8c98bb6a

release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650

Change-Id: I5052b317be7432d19602b810635c026b5b34576c

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 4762862..d757c7b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -31,7 +31,9 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
 include $(BUILD_PACKAGE)