summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-03-01 13:21:09 +0000
committerPaul Duffin <paulduffin@google.com>2017-03-01 13:21:09 +0000
commit16d0804a18665b63fe9e75969f24c53114dcdaf8 (patch)
treefb4a2aead0705e26d8a526c54ff1574a324d58e0
parent374426a588bfffc7d0657bffe05b65660b438007 (diff)
downloadreplicaisland-16d0804a18665b63fe9e75969f24c53114dcdaf8.tar.gz
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: I63ad65424765c5082e11f3491af4f58261cb45f1
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index e8bd717..30aeab7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,8 @@ LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := junit
+
LOCAL_PACKAGE_NAME := com.replica.replicaisland
# Tag this module as a cts test artifact