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

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

Browse Source 
am: b2ac85e76d

Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa
This commit is contained in:
Paul Duffin
2017-05-09 10:29:59 +00:00
committed by android-build-merger
parent 717238a614 b2ac85e76d
commit edefe593e3
9 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/uiautomator/instrumentation/Android.mk
View File

@@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \ LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \
$(call all-java-files-under, ../library/core-src) $(call all-java-files-under, ../library/core-src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_MODULE := uiautomator-instrumentation LOCAL_MODULE := uiautomator-instrumentation
# TODO: change this to 18 when it's available # TODO: change this to 18 when it's available
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current

2
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk
View File

@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := junit
LOCAL_PACKAGE_NAME := ExternalLocAllPermsTestApp LOCAL_PACKAGE_NAME := ExternalLocAllPermsTestApp
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk
View File

@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := ExternalSharedPermsTestApp LOCAL_PACKAGE_NAME := ExternalSharedPermsTestApp

2
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk
View File

@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := ExternalSharedPermsBTTestApp LOCAL_PACKAGE_NAME := ExternalSharedPermsBTTestApp

2
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk
View File

@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := ExternalSharedPermsDiffKeyTestApp LOCAL_PACKAGE_NAME := ExternalSharedPermsDiffKeyTestApp

2
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk
View File

@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := ExternalSharedPermsFLTestApp LOCAL_PACKAGE_NAME := ExternalSharedPermsFLTestApp

3
services/tests/shortcutmanagerutils/Android.mk
View File

@@ -20,7 +20,8 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, src) $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target mockito-target \
legacy-android-test
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

2
tests/SurfaceComposition/Android.mk
View File

@@ -27,6 +27,8 @@ LOCAL_PROGUARD_ENABLED := disabled
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
LOCAL_PACKAGE_NAME := SurfaceComposition LOCAL_PACKAGE_NAME := SurfaceComposition
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current

6
tests/WindowAnimationJank/Android.mk
View File

@@ -24,7 +24,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := WindowAnimationJank LOCAL_PACKAGE_NAME := WindowAnimationJank
LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator ub-janktesthelper LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
ub-janktesthelper \
legacy-android-test \
junit
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current