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

Commit 733e1e1c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Stop statically including legacy-android-test"

parents fdb7dd54 6a73bd65

app-perf-tests/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -6,12 +6,11 @@ LOCAL_MODULE_TAGS := tests 


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



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator \

    legacy-android-test

    ub-uiautomator



LOCAL_USE_AAPT2 := true

LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests

perf-tests/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -8,14 +8,13 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ 
    $(call all-java-files-under, ../tests/common/com/android/documentsui) \

    ../tests/functional/com/android/documentsui/ActivityTest.java



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock

LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator \

    ub-janktesthelper \

    espresso-core \

    legacy-android-test

    espresso-core



LOCAL_USE_AAPT2 := true

LOCAL_PACKAGE_NAME := DocumentsUIPerfTests

tests/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -12,13 +12,12 @@ LOCAL_SRC_FILES := $(call all-java-files-under, common) \ 
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_AAPT_FLAGS += -0 .zip



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    ub-uiautomator \

    espresso-core \

    guava \

    legacy-android-test

    guava

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

LOCAL_PACKAGE_NAME := DocumentsUITests

LOCAL_COMPATIBILITY_SUITE := device-tests