aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-05-08 20:14:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-08 20:14:35 +0000
commit5151513a15f55677de0398972f7a679808bed58b (patch)
tree80c64d4078ce7b2d90c6f1514d2c8233a9c60e63
parent84e782d4d1df477a37437b1fede9d494a1d2d3c6 (diff)
parent341a052cf9a19df8b53062ceadbeaf4b108033a8 (diff)
downloadlatinime-5151513a15f55677de0398972f7a679808bed58b.tar.gz
latinime-5151513a15f55677de0398972f7a679808bed58b.tar.xz
latinime-5151513a15f55677de0398972f7a679808bed58b.zip
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18
am: 341a052cf9 Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d
-rw-r--r--tests/Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 0b5449143..cc5761129 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,7 +24,10 @@ LOCAL_AAPT_FLAGS += -0 .dict
# Do not compress test data file
LOCAL_AAPT_FLAGS += -0 .txt
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-test \
+ mockito-target \
+ legacy-android-test
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)