commit 60d4545611ade0fffec6a618779fffce27e1ca35
author Paul Duffin <paulduffin@google.com> Wed Jan 18 16:37:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 16:37:45 2017 +0000
tree 605e8afe4a230dc956db46e9f5c3ffb74b5d4890
parent ff7a2e43c4545bda638549369cd0550f04f22715
parent 488ffd1db1eb3a7cf88bc7780420f91df8842fb2

Merge "Prepare for removal of legacy-test from default targets" am: a691d6c012 am: 1fc636d62b
am: 488ffd1db1

Change-Id: I5677f7023129dcacba6babe73e6b047e27f879b3

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 892a3b8..e6eb52d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,6 +19,7 @@
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
+LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)