diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-06-13 12:42:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 12:42:45 +0000 |
| commit | ef26655bcf0cd850244390d5c97c2640e5cf91d4 (patch) | |
| tree | edbc48b25cf1d0ea1c9444f38af12c4e6bd2c05e | |
| parent | 8937acfca0eff28d16919493ecc1b700a79885d5 (diff) | |
| parent | 8e49b42b6fde177fb242da12bb05365ef03362e1 (diff) | |
| download | android_packages_apps_Dialer-ef26655bcf0cd850244390d5c97c2640e5cf91d4.tar.gz android_packages_apps_Dialer-ef26655bcf0cd850244390d5c97c2640e5cf91d4.tar.bz2 android_packages_apps_Dialer-ef26655bcf0cd850244390d5c97c2640e5cf91d4.zip | |
Merge "Fix dependencies of packages that target earlier releases"
am: 8e49b42b6f
Change-Id: If33a227619c50e0d2b19dd3cc9f14e9d45ad5807
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 91e127040..45a5b8d4e 100644 --- a/Android.mk +++ b/Android.mk @@ -58,7 +58,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ com.android.vcard \ guava \ libphonenumber \ - legacy-android-test \ junit LOCAL_PACKAGE_NAME := Dialer diff --git a/tests/Android.mk b/tests/Android.mk index 07f4f00d9..53cb238ef 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -19,6 +19,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_STATIC_JAVA_LIBRARIES += \ mockito-target +LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test + LOCAL_PACKAGE_NAME := DialerTests LOCAL_INSTRUMENTATION_FOR := Dialer |