commit 2e693db64ad256a2e3bf5430c3687f1b82f4152a
author android-build-team Robot <android-build-team-robot@google.com> Mon Dec 11 12:06:57 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Dec 11 12:06:57 2017 +0000
tree ed63ebb89eaa5bd629f148b764045cb17702c1d7
parent 878cb1d10e771d48e473bef9f4fb7f4ad6a728de
parent 87a4755e8bff0166302777d3ddd1608d39e7a183

Snap for 4496165 from 87a4755e8bff0166302777d3ddd1608d39e7a183 to pi-release

Change-Id: I0ab1586bb0a17dcac0cdaad29f10fc05ba6a107d

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 0edf0c9..93a3570 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -4,9 +4,9 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
 
 # Only compile source java files in this apk.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)