commit 3a571c9b54bdd00dca20015e19bc996f29b84dfe
author android-build-team Robot <android-build-team-robot@google.com> Mon Dec 11 12:24:55 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Dec 11 12:24:55 2017 +0000
tree faeb90e0e910d62549d1e5158f8897b57ba080cf
parent ee042bb7479a21ee428ad2e1fcaca4975d3c0611
parent 5879495b4f1b2e0adf436fff01350b873806825c

Snap for 4496165 from 5879495b4f1b2e0adf436fff01350b873806825c to pi-release

Change-Id: Ic78d70d9b89da49a903c30ef0402f0f542c3230d

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index baf1103..95c8622 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -4,8 +4,8 @@
 # We only want this apk build for tests.
 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
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)