commit 8aeb59ebcd50a510d024dc082fa17b192074c63d
author Paul Duffin <paulduffin@google.com> Tue Jan 10 12:08:23 2017 +0000
committer Paul Duffin <paulduffin@google.com> Wed Jan 18 16:39:34 2017 +0000
tree b7f3e92f4eebc63df03fd63d35b0eafc18ccc81c
parent 57b8eb3da0c4692ac4f39a9c73aa090af475d14a

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.

Bug: 30188076
Test: make checkbuild
Change-Id: I13e88297731253420e4e5f5291d503f13a39a156

nfc-extras/Android.mk

diff --git a/nfc-extras/Android.mk b/nfc-extras/Android.mk
index 330e2d4..cd7a45b 100644
--- a/nfc-extras/Android.mk
+++ b/nfc-extras/Android.mk
@@ -6,6 +6,8 @@
 
 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)