e2fea86b44
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: I278fcf0b7f4972c473462eb88c46a111b0ce7d89
59 lines
1.7 KiB
Makefile
59 lines
1.7 KiB
Makefile
# Copyright (C) 2008 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
LOCAL_PATH:= $(call my-dir)
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
# don't include this package in any target
|
|
LOCAL_MODULE_TAGS := optional
|
|
# and when built explicitly put it in the data partition
|
|
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
|
|
|
|
# Include both the 32 and 64 bit versions
|
|
LOCAL_MULTILIB := both
|
|
|
|
LOCAL_JAVA_LIBRARIES := \
|
|
voip-common \
|
|
conscrypt \
|
|
org.apache.http.legacy \
|
|
android.test.base.stubs \
|
|
|
|
|
|
LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \
|
|
libnativemultinetwork_jni libnativehelper_compat_libc++
|
|
|
|
# include CtsTestServer as a temporary hack to free net.cts from cts.stub.
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_PACKAGE_NAME := CtsNetTestCases
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := \
|
|
core-tests-support \
|
|
compatibility-device-util \
|
|
ctstestrunner \
|
|
ctstestserver \
|
|
mockwebserver \
|
|
junit
|
|
|
|
# uncomment when b/13249961 is fixed
|
|
#LOCAL_SDK_VERSION := current
|
|
|
|
# Tag this module as a cts test artifact
|
|
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
|
|
|
|
include $(BUILD_CTS_PACKAGE)
|
|
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|