diff options
| author | Jiyong Park <jiyong@google.com> | 2018-01-24 15:30:13 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-01-24 15:30:13 +0900 |
| commit | d84a8d8cf4bf22cebb17e1e9b69e89d7283f4ea5 (patch) | |
| tree | 5053087b98c74ded3bce4e558c65e724e12af947 | |
| parent | c7904e1d055d64ce363b4623a6a1f0777fe848fa (diff) | |
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
| -rw-r--r-- | cmds/uiautomator/instrumentation/Android.mk | 2 | ||||
| -rw-r--r-- | nfc-extras/tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/notification/Android.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk index ed99f3e14922..e887539b718a 100644 --- a/cmds/uiautomator/instrumentation/Android.mk +++ b/cmds/uiautomator/instrumentation/Android.mk @@ -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 diff --git a/nfc-extras/tests/Android.mk b/nfc-extras/tests/Android.mk index 34d65082d8d8..51396d3346e9 100644 --- a/nfc-extras/tests/Android.mk +++ b/nfc-extras/tests/Android.mk @@ -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 diff --git a/tests/notification/Android.mk b/tests/notification/Android.mk index 0669553bf03e..255e6e70a921 100644 --- a/tests/notification/Android.mk +++ b/tests/notification/Android.mk @@ -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 |