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

Commit d84a8d8c authored by Jiyong Park's avatar Jiyong Park
Browse files

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

android.test.base/runner/mock libraries are shared libraries that are
built without SDK, but with framework interanl libraries (framework.jar,
etc). Apps or libs that are built with SDK (LOCAL_SDK_VERSION is set)
shouldn't use them, but instead the stubs version of the test framework
libraries, which are built using SDK.

This is because, the build system does not allow a module built with SDK
to depend on another module built without SDK. This has been
exceptionally allowed with warnings, but will soon be errors.

In order to prevent the expected build breakage, direct reference to the
shared libraries are all changed to the stubs libraries.

Note: no one has been using these shared libs statically. So, it is
guaranteed that they won't encounter a problem due to missing
<uses-library name="android.test.runner"/> even after this change.

Bug: 69899800
Test: m -j checkbuild
Change-Id: Ib7e2bbecdc8c9327010aa772e820e9ae84e46518
parent c7904e1d

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