commit e9ca8e83f940adb42e28a304b4818c9a3b049880
author Paul Duffin <paulduffin@google.com> Wed Jan 18 15:16:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 15:16:49 2017 +0000
tree 97d2d2b6714ca96f0051c296d99f72d111269847
parent 755cb99713078ad9d9a154926c5769a78f69e43f
parent d166148abab4af9111e325a859f86d58e2a04c0b

Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1 am: 4ffb04dd9d am: 5ad3c04da5
am: d166148aba

Change-Id: I251673fa685efcb91b7c0159ff6172faade2dc98

tests/Android.mk

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