From ccb04450279c53eda250ac3e20b75cd07bcd1f7e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Jan 2017 12:08:23 +0000 Subject: Prepare for removal of legacy-test from default targets In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. (cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f) Bug: 30188076 Test: make checkbuild Merged-In: I13e88297731253420e4e5f5291d503f13a39a156 Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b --- nfc-extras/Android.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nfc-extras') diff --git a/nfc-extras/Android.mk b/nfc-extras/Android.mk index 330e2d4ec17d..cd7a45b577de 100644 --- a/nfc-extras/Android.mk +++ b/nfc-extras/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test + LOCAL_MODULE:= com.android.nfc_extras include $(BUILD_JAVA_LIBRARY) -- cgit v1.2.3