Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prepare for removal of legacy-test from default targets"

Browse Source
This commit is contained in:
Paul Duffin
2017-01-19 11:56:37 +00:00
committed by Android (Google) Code Review
parent ccd4fa8e60 1250371b6b
commit 8cedf7e8e8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/app/Android.mk
View File

@@ -13,7 +13,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
espresso-core \ espresso-core \
espresso-contrib-nodep \ espresso-contrib-nodep \
espresso-intents-nodep \ espresso-intents-nodep \
ub-uiautomator ub-uiautomator \
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)

3
tests/unit/Android.mk
View File

@@ -11,7 +11,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target-minus-junit4 \ mockito-target-minus-junit4 \
espresso-core \ espresso-core \
truth-prebuilt truth-prebuilt \
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)