4cdec67417
android.test.legacy is now build against SDK, thus available to apps build with SDK. In doing so, android.test.mock.stubs had to be built with SDK (because it is used by android.test.legacy). However, this wasn't trivial. The problem was that some classes in test-mock implemented abstract methods of platform classes. Even though they are marked as @hide, doclava automatically emit them to the stub file because otherwise the class in the stub file does not implement some abstract methods from its parent class, which in turn makes the stub file non-compilable. This CL solves the problem by introducing an adapter class in between the class in test-mock and the class in the framework. The adapter class implements abstract methods which are @hide and having reference to types that aren't available to SDK. The abstract methods are removed from the original class. Then doclava does not emit the abstract methods. Also by @hide'ing the adapter classes, they are not compiled when building the stub library. Bug: 30188076 Bug: 73339598 Test: m -j android.test.base Test: m -j android.test.legacy Test: m -j android.test.mock.stubs are successful and do not show link-check warning Merged-In: I8e432950e693ee3c6f0240852e62da6133d31571 Change-Id: I8e432950e693ee3c6f0240852e62da6133d31571
63 lines
2.4 KiB
Makefile
63 lines
2.4 KiB
Makefile
#
|
|
# Copyright (C) 2018 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)
|
|
|
|
# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.
|
|
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
|
|
|
|
# Build the android.test.legacy library
|
|
# =====================================
|
|
# Built against the SDK so that it can be statically included in APKs
|
|
# without breaking link type checks.
|
|
#
|
|
# This builds directly from the source rather than simply statically
|
|
# including the android.test.base-minus-junit and
|
|
# android.test.runner-minus-junit libraries because the latter library
|
|
# cannot itself be built against the SDK. That is because it uses on
|
|
# an internal method (setTestContext) on the AndroidTestCase class.
|
|
# That class is provided by both the android.test.base-minus-junit and
|
|
# the current SDK and as the latter is first on the classpath its
|
|
# version is used. Unfortunately, it does not provide the internal
|
|
# method and so compilation fails.
|
|
#
|
|
# Building from source avoids that because the compiler will use the
|
|
# source version of AndroidTestCase instead of the one from the current
|
|
# SDK.
|
|
#
|
|
# The use of the internal method does not prevent this from being
|
|
# statically included because the class that provides the method is
|
|
# also included in this library.
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := android.test.legacy
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(call all-java-files-under, ../test-base/src/android) \
|
|
$(call all-java-files-under, ../test-base/src/com) \
|
|
$(call all-java-files-under, ../test-runner/src/android) \
|
|
|
|
LOCAL_SDK_VERSION := current
|
|
|
|
LOCAL_JAVA_LIBRARIES := junit android.test.mock.stubs
|
|
|
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
|
|
# Archive a copy of the classes.jar in SDK build.
|
|
$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.legacy.jar)
|
|
|
|
endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
|