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
123 lines
4.6 KiB
Makefile
123 lines
4.6 KiB
Makefile
#
|
|
# Copyright (C) 2016 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)))
|
|
|
|
# Generate the stub source files for android.test.base.stubs
|
|
# ==========================================================
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(call all-java-files-under, src)
|
|
|
|
LOCAL_SDK_VERSION := current
|
|
|
|
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
|
LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src
|
|
|
|
ANDROID_TEST_BASE_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/api.txt
|
|
ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/removed.txt
|
|
|
|
ANDROID_TEST_BASE_API_FILE := $(LOCAL_PATH)/api/android-test-base-current.txt
|
|
ANDROID_TEST_BASE_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-base-removed.txt
|
|
|
|
LOCAL_DROIDDOC_OPTIONS:= \
|
|
-stubpackages android.test:android.test.suitebuilder.annotation:com.android.internal.util:junit.framework \
|
|
-stubsourceonly \
|
|
-stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/src \
|
|
-nodocs \
|
|
-api $(ANDROID_TEST_BASE_OUTPUT_API_FILE) \
|
|
-removedApi $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE) \
|
|
|
|
LOCAL_UNINSTALLABLE_MODULE := true
|
|
LOCAL_MODULE := android-test-base-api-stubs-gen
|
|
|
|
include $(BUILD_DROIDDOC)
|
|
|
|
# Remember the target that will trigger the code generation.
|
|
android_test_base_gen_stamp := $(full_target)
|
|
|
|
# Add some additional dependencies
|
|
$(ANDROID_TEST_BASE_OUTPUT_API_FILE): $(full_target)
|
|
$(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE): $(full_target)
|
|
|
|
# Build the android.test.base.stubs library
|
|
# =========================================
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := android.test.base.stubs
|
|
|
|
LOCAL_SOURCE_FILES_ALL_GENERATED := true
|
|
LOCAL_SDK_VERSION := current
|
|
|
|
# Make sure to run droiddoc first to generate the stub source files.
|
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_base_gen_stamp)
|
|
android_test_base_gen_stamp :=
|
|
|
|
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.base.stubs.jar)
|
|
|
|
# Check that the android.test.base.stubs library has not changed
|
|
# ==============================================================
|
|
|
|
# Check that the API we're building hasn't changed from the not-yet-released
|
|
# SDK version.
|
|
$(eval $(call check-api, \
|
|
check-android-test-base-api-current, \
|
|
$(ANDROID_TEST_BASE_API_FILE), \
|
|
$(ANDROID_TEST_BASE_OUTPUT_API_FILE), \
|
|
$(ANDROID_TEST_BASE_REMOVED_API_FILE), \
|
|
$(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE), \
|
|
-error 2 -error 3 -error 4 -error 5 -error 6 \
|
|
-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
|
|
-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
|
|
-error 25 -error 26 -error 27, \
|
|
cat $(LOCAL_PATH)/api/apicheck_msg_android_test_base.txt, \
|
|
check-android-test-base-api, \
|
|
$(call doc-timestamp-for,android-test-base-api-stubs-gen) \
|
|
))
|
|
|
|
.PHONY: check-android-test-base-api
|
|
checkapi: check-android-test-base-api
|
|
|
|
.PHONY: update-android-test-base-api
|
|
update-api: update-android-test-base-api
|
|
|
|
update-android-test-base-api: $(ANDROID_TEST_BASE_OUTPUT_API_FILE) | $(ACP)
|
|
@echo Copying current.txt
|
|
$(hide) $(ACP) $(ANDROID_TEST_BASE_OUTPUT_API_FILE) $(ANDROID_TEST_BASE_API_FILE)
|
|
@echo Copying removed.txt
|
|
$(hide) $(ACP) $(ANDROID_TEST_BASE_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_BASE_REMOVED_API_FILE)
|
|
|
|
endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
|
|
|
|
ifeq ($(HOST_OS),linux)
|
|
# Build the legacy-performance-test-hostdex library
|
|
# =================================================
|
|
# This contains the android.test.PerformanceTestCase class only
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := src/android/test/PerformanceTestCase.java
|
|
LOCAL_MODULE := legacy-performance-test-hostdex
|
|
|
|
include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
|
|
endif # HOST_OS == linux
|