commit 41e553f6ec13e860694a2790cea82a4300b6703e
author Paul Duffin <paulduffin@google.com> Tue Jun 13 14:17:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 13 14:17:30 2017 +0000
tree 85ee8414046b37fe0cbedbcfc8edc962c7989ac4
parent cd7eb92ee2737c06e8abd76ed6e4ef67a48840ec
parent 7367ead0f0df80e888f7f5d9603d83dd52787517

Merge "Fix dependencies of packages that target earlier releases"

Android.mk

diff --git a/Android.mk b/Android.mk
index 52c7dcb..981b711 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,7 +36,6 @@
     android-support-v7-palette \
     android-support-v4 \
     libphonenumber \
-    legacy-android-test \
     junit
 
 LOCAL_PACKAGE_NAME := Contacts

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 4fd947c..a14e17a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,6 +7,8 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
+
 src_dirs := src \
     ../../ContactsCommon/TestCommon/src