Merge Android Pie into master
Bug: 112104996
Change-Id: I9894e8ea2aca7b32769e86fab52b7ee914fbb310
diff --git a/tests/Android.mk b/tests/Android.mk
index 58b4cb0..8741795 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)
