PawletOS/app_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" am: a6b0c881fd

Browse Source 
am: a3da659863

Change-Id: Id36b48a4a25aa564b5270ad16aa5a2eb1eadfadb
This commit is contained in:
Paul Duffin
2017-01-19 15:20:26 +00:00
committed by android-build-merger
parent 4dac712d7c a3da659863
commit cf967da02a
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

@@ -10,7 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target \ mockito-target \
espresso-core espresso-core \
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)