commit a1ba4867640a96cbb6c44f656c3da18334923a9b
author Paul Duffin <paulduffin@google.com> Thu Jun 15 07:45:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 07:45:33 2017 +0000
tree 373c2130b94ae0590653711f1629f291d5448166
parent d3b1093e88c1d4051b234e4faf6a4ffda8bdc3e0
parent 6087c3f339a76e9033f6c2991ef26d4401743429

Merge "Fix dependencies of packages that target earlier releases" am: a3efe60e6b am: 6387a14bfe
am: 6087c3f339

Change-Id: I3ed6301554b766c303e57f11320d9c386d4a873a

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)