commit 0c03af3e6647531906da6c57fc7884fec65aef3a
author Paul Duffin <paulduffin@google.com> Wed Jan 18 16:41:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 16:41:26 2017 +0000
tree 76ba1a36294b2668926911b08a0c52645e344399
parent e2385a425de395aa06e2a7421b7f38b0909d44d6
parent 60d4545611ade0fffec6a618779fffce27e1ca35

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

Change-Id: If8d5ee3ac45308c0a154c828286eff5939e92293

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)