summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-05-03 13:52:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-03 13:52:03 +0000
commit090ce68ceecc09780db4797277a3aaf8c7546a0b (patch)
treed611f2af2181dce9d987a7a370d40e3ad1e5860f
parent1e92b1fd0582adeea533b05d9423907239ca9069 (diff)
parent3db794bafd7f4a87024768fddc4363c05928b2b9 (diff)
downloadandroid_packages_apps_Trebuchet-090ce68ceecc09780db4797277a3aaf8c7546a0b.tar.gz
android_packages_apps_Trebuchet-090ce68ceecc09780db4797277a3aaf8c7546a0b.tar.bz2
android_packages_apps_Trebuchet-090ce68ceecc09780db4797277a3aaf8c7546a0b.zip
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: a80a70f2f8 am: 810eb447e9
am: 3db794bafd Change-Id: Ide6df9e4caade943922035b17a65bd8f73d9acd9
-rw-r--r--tests/Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 61ee220e8..c91e793fc 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -17,7 +17,10 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-test \
+ ub-uiautomator \
+ legacy-android-test
LOCAL_SRC_FILES := $(call all-java-files-under, src)