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

Commit 97ad022e authored by Paul Duffin's avatar Paul Duffin
Browse files

Prepare for removal of legacy-test from default libraries 

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

Bug: 30188076
Test: make checkbuild
Change-Id: I33c44d22d3e4e4e86013ce30d244b0bb433eb109
parent 90c18935

app-perf-tests/Android.mk

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



LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator \

    legacy-android-test



LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests

LOCAL_INSTRUMENTATION_FOR := DocumentsUI

perf-tests/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ 
    ../tests/functional/com/android/documentsui/ActivityTest.java



LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator ub-janktesthelper espresso-core

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator \

    ub-janktesthelper \

    espresso-core \

    legacy-android-test



LOCAL_PACKAGE_NAME := DocumentsUIPerfTests

LOCAL_INSTRUMENTATION_FOR := DocumentsUI

tests/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -13,7 +13,12 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 
LOCAL_AAPT_FLAGS += -0 .zip



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator \

    espresso-core \

    guava \

    legacy-android-test

LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt

LOCAL_PACKAGE_NAME := DocumentsUITests

LOCAL_INSTRUMENTATION_FOR := DocumentsUI