commit bf7d366cee5e67c6f38b46aafb756a980169a5b1
author Paul Duffin <paulduffin@google.com> Mon Nov 28 15:51:09 2016 +0000
committer Paul Duffin <paulduffin@google.com> Tue Nov 29 12:46:53 2016 +0000
tree fe51df1dc5a84ffbf5122b69b1188f94d7d1b4ef
parent 3e68bb5d281d8eddac11ad64b64f8869b068a776

Add legacy-test as replacement for core-junit

Statically includes core-junit-static into legacy-test target so
that legacy-test can be used in place of core-test. Once that
switch over has been done then android.test classes that are
being removed from the public API can be safely moved into here.

(cherry picked from commit bc90fcb983bb8d8066d50de90af5190a07c0a7f4)

Bug: 30188076
Test: make legacy-test and check contents of generated legacy-test artifacts
Change-Id: I7cdbeff5d95473ec2bfe6341d3957cf38d98e933

Android.mk

diff --git a/Android.mk b/Android.mk
index 514ed47..62d8b77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -515,7 +515,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp legacy-test bouncycastle ext
 
 LOCAL_STATIC_JAVA_LIBRARIES :=                          \
     framework-protos                                    \