commit 61316803f25f6519b5a8a9ffa1796183625372d2
author Paul Duffin <paulduffin@google.com> Thu Jan 19 15:22:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 19 15:22:55 2017 +0000
tree 10549c6cdd3a7bd4179c5458351e9adb67c39513
parent a46e4a4e49c7dd6d688db940217aecaae969765b
parent cf967da02a08e75b28163e2f6963ae0fb9af2b46

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

Change-Id: Ifc88129c31c074674f42ee356382dd6aa5022952

tests/app/Android.mk

diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index 979c27d..381006a 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -13,7 +13,8 @@
     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)

tests/unit/Android.mk

diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 5b20173..b8f4523 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -10,7 +10,8 @@
 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)