diff options
| author | Jiyong Park <jiyong@google.com> | 2018-01-24 15:21:38 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-01-24 15:21:38 +0900 |
| commit | 8c8cb53a4f4fac3a9db23171b951c0c56b680111 (patch) | |
| tree | a83969470169cc7d5083b5a52a5bb40184e9feae /samples/ApiDemos | |
| parent | 42e2e46dba01a9b1c1f60e8cccf0b7857ac0457b (diff) | |
| download | android_development-8c8cb53a4f4fac3a9db23171b951c0c56b680111.tar.gz android_development-8c8cb53a4f4fac3a9db23171b951c0c56b680111.tar.bz2 android_development-8c8cb53a4f4fac3a9db23171b951c0c56b680111.zip | |
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: I7f25e0127c52c56adf288163a760f3dc9aee6586
Diffstat (limited to 'samples/ApiDemos')
| -rw-r--r-- | samples/ApiDemos/tests/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk index 44d686946..b2a94037b 100644 --- a/samples/ApiDemos/tests/Android.mk +++ b/samples/ApiDemos/tests/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -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 |