Commit 5f9c9b51 authored Mar 01, 2017 by Paul Duffin

Prepare for removal of junit and android.test classes from Android API (step 1)

In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Iafd159ec5034eed76cb8af21f65568d815161632
Merged-In: Iffdd8aa11abfeb0d212a892cb5b69ece49dd68fa

parent 111f2103

Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-v7-cardview \
		android-support-v7-palette \
		android-support-v4 \
		libphonenumber
		libphonenumber \
		legacy-android-test \
		junit

		LOCAL_PACKAGE_NAME := Contacts
		LOCAL_CERTIFICATE := shared