Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ac85e7 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

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

parents 767ac317 702d506d

cmds/uiautomator/instrumentation/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \

    $(call all-java-files-under, ../library/core-src)

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit

LOCAL_MODULE := uiautomator-instrumentation

# TODO: change this to 18 when it's available

LOCAL_SDK_VERSION := current

core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 


LOCAL_SDK_VERSION := current



LOCAL_STATIC_JAVA_LIBRARIES := junit



LOCAL_PACKAGE_NAME := ExternalLocAllPermsTestApp



include $(BUILD_PACKAGE)

core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit



LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := ExternalSharedPermsTestApp

core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit



LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := ExternalSharedPermsBTTestApp

core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit



LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := ExternalSharedPermsDiffKeyTestApp