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

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

Merge "Use stubs libs for android.test.base/runner/mock"

parents ac9a7c05 d84a8d8c

cmds/uiautomator/instrumentation/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ include $(CLEAR_VARS) 
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 android.test.base.stubs

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

LOCAL_STATIC_JAVA_LIBRARIES := junit

LOCAL_MODULE := uiautomator-instrumentation

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

nfc-extras/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES := \

    android.test.runner \

    android.test.runner.stubs \

    com.android.nfc_extras \

    android.test.base.stubs

tests/notification/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := tests 
# Include all test java files.

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



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_JAVA_LIBRARIES := android.test.runner.stubs

LOCAL_PACKAGE_NAME := NotificationTests



LOCAL_SDK_VERSION := 21