From e2fea86b44e94f058d0adbda6948fcc87a7e4135 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 24 Jan 2018 15:10:49 +0900 Subject: [PATCH] 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 even after this change. Bug: 69899800 Test: m -j checkbuild Change-Id: I278fcf0b7f4972c473462eb88c46a111b0ce7d89 --- tests/cts/net/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index 1d4d54b644..e3484069b5 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_LIBRARIES := \ voip-common \ conscrypt \ org.apache.http.legacy \ - android.test.base \ + android.test.base.stubs \ LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \