f71d5b5b18
These classes are only used by android.test classes that are being removed. As their name suggests they should not be in the Android API at all so it makes sense to remove them. Especially as there is java.lang.function.Predicate available now. It appears as though Predicate was only added in to the API because it was used by a method in the API as the directory in which it and Predicates live was not on the list of classes to explicitly index. Moving it into legacy-test meant that they are now being indexed explicitly which means that Predicates needs to be hidden. Keeps running the tests as part of the existing target. At runtime apps targeted at the API version before these are removed will have the legacy-test library automatically added to their classpath so they should see no effect. Apps that target a later API will have to include those classes from the android.legacy.test.jar which will contain all the android.test classes that depend on it as well. Bug: 30188076 Test: make checkbuild Change-Id: I6f6f5f16fe93bd80227a450c6254166632fc6813
75 lines
2.5 KiB
Makefile
75 lines
2.5 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)
|
|
|
|
# Build the legacy-test library
|
|
# =============================
|
|
# This contains the junit.framework and android.test classes that were in
|
|
# Android API level 25 excluding those from android.test.runner.
|
|
# Also contains the com.android.internal.util.Predicate[s] classes.
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_MODULE := legacy-test
|
|
LOCAL_NO_STANDARD_LIBRARIES := true
|
|
LOCAL_JAVA_LIBRARIES := core-oj core-libart framework
|
|
|
|
include $(BUILD_JAVA_LIBRARY)
|
|
|
|
# Build the legacy-android-test library
|
|
# =====================================
|
|
# This contains the android.test classes that were in Android API level 25,
|
|
# including those from android.test.runner.
|
|
# Also contains the com.android.internal.util.Predicate[s] classes.
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(call all-java-files-under, src/android) \
|
|
$(call all-java-files-under, ../test-runner/src/android) \
|
|
$(call all-java-files-under, src/com)
|
|
LOCAL_MODULE := legacy-android-test
|
|
LOCAL_NO_STANDARD_LIBRARIES := true
|
|
LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit
|
|
|
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
|
|
# Build the legacy-android-tests library
|
|
# ======================================
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(call all-java-files-under, tests)
|
|
LOCAL_MODULE := legacy-android-tests
|
|
LOCAL_NO_STANDARD_LIBRARIES := true
|
|
LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit
|
|
LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test
|
|
|
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
|
|
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
|