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

Commit fa6f8a76 authored by Paul Duffin's avatar Paul Duffin
Browse files

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

In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild

(cherry picked from commit 00229bc6)

Change-Id: I7fea20f92a5a92885733bc6ecb83b7276a48fbc2
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
parent 168bffa0

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