commit 8e49b42b6fde177fb242da12bb05365ef03362e1
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 13 12:39:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 13 12:39:27 2017 +0000
tree edbc48b25cf1d0ea1c9444f38af12c4e6bd2c05e
parent 8937acfca0eff28d16919493ecc1b700a79885d5
parent 5ae8501b930df9c2d7ccab1adece3e88e7c7c755

Merge "Fix dependencies of packages that target earlier releases"

Android.mk

diff --git a/Android.mk b/Android.mk
index 91e1270..45a5b8d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,6 @@
     com.android.vcard \
     guava \
     libphonenumber \
-    legacy-android-test \
     junit
 
 LOCAL_PACKAGE_NAME := Dialer

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 07f4f00..53cb238 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,6 +19,8 @@
 LOCAL_STATIC_JAVA_LIBRARIES += \
         mockito-target
 
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
+
 LOCAL_PACKAGE_NAME := DialerTests
 
 LOCAL_INSTRUMENTATION_FOR := Dialer