Merge "Prepare for removal of legacy-test from default targets"

am: a6b0c881fd Change-Id: Iadb65fd5a2630e74071866f2d0b4347d29a71af1
2017-01-19 15:17:53 +00:00
parent 058533ae25 a6b0c881fd
commit a3da659863
2 changed files with 4 additions and 2 deletions
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -13,7 +13,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
    espresso-core \
    espresso-contrib-nodep \
    espresso-intents-nodep \
-    ub-uiautomator
+    ub-uiautomator \
+    legacy-android-test

 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -10,7 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := \
    android-support-test \
    mockito-target \
-    espresso-core
+    espresso-core \
+    legacy-android-test

 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)