Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"

am: 83f0d8dc18

Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4
This commit is contained in:
Paul Duffin 2017-05-08 20:05:51 +00:00 committed by android-build-merger
commit 341a052cf9

View file

@ -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)