commit cb65c7276e57d7097674a123ffcbd674ac3a8442
author Tyler Gunn <tgunn@google.com> Tue Dec 12 01:40:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 12 01:40:41 2017 +0000
tree 282a52e6041cd6b120ce75dda3c6b9f061028578
parent 767b5ed83efe6bd7eed25e4ef2252c7367f59d60
parent 987286c2ec76f50a9a5fe53915a9ec70df6cf6f4

Merge "Ensure hold tones are always played." am: fcd2dfbce2 am: 5dd184c490
am: 987286c2ec

Change-Id: I7ec931e84d8f3b293fdbaad15d6ea0f9d39fb7e2

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index fe6aa71..e5a4480 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -3,8 +3,8 @@
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
+LOCAL_STATIC_JAVA_LIBRARIES := junit
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)