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

am: 341a052cf9

Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d
main
Paul Duffin 2017-05-08 20:14:35 +00:00 committed by android-build-merger
commit 5151513a15
1 changed files with 4 additions and 1 deletions

View File

@ -24,7 +24,10 @@ LOCAL_AAPT_FLAGS += -0 .dict
# Do not compress test data file # Do not compress test data file
LOCAL_AAPT_FLAGS += -0 .txt 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. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)