Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd am: a3da659863

am: cf967da02a Change-Id: Ifc88129c31c074674f42ee356382dd6aa5022952
2017-01-19 15:22:55 +00:00
parent a46e4a4e49 cf967da02a
commit 61316803f2
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)