diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-15 22:27:30 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-15 22:27:30 +0000 |
commit | dab5f8e7e0846925fc3c39f2b34e431d29a54b68 (patch) | |
tree | af2761206bf4e69fbc936e4a5078d63e30f379cd | |
parent | e93ceafe6a90348abd5da70af33f6225910d0e97 (diff) | |
parent | a492bde8a329f6d5cce8c2534acbc07493644cf1 (diff) | |
download | build-dab5f8e7e0846925fc3c39f2b34e431d29a54b68.tar.gz |
Snap for 7035108 from a492bde8a329f6d5cce8c2534acbc07493644cf1 to mainline-releaseandroid-mainline-11.0.0_r5android-mainline-11.0.0_r19
Change-Id: I1109e6de98b62e800301722cc12c5af16128ecbf
-rw-r--r-- | core/tasks/general-tests.mk | 2 | ||||
-rw-r--r-- | core/tasks/mts.mk | 21 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 | ||||
-rw-r--r-- | target/product/base_system.mk | 33 | ||||
-rw-r--r-- | target/product/bootclasspath.mk | 48 |
5 files changed, 64 insertions, 42 deletions
diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk index cb84a5ca74..a820a28f25 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk @@ -14,12 +14,10 @@ .PHONY: general-tests -# TODO(b/149249068): Remove vts10-tradefed.jar after all VTS tests are converted general_tests_tools := \ $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests) general_tests_zip := $(PRODUCT_OUT)/general-tests.zip diff --git a/core/tasks/mts.mk b/core/tasks/mts.mk index e800505e56..e0848560d1 100644 --- a/core/tasks/mts.mk +++ b/core/tasks/mts.mk @@ -13,13 +13,20 @@ # limitations under the License. ifneq ($(wildcard test/mts/README.md),) -test_suite_name := mts -test_suite_tradefed := mts-tradefed -test_suite_readme := test/mts/README.md -include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk +mts_test_suites := +mts_test_suites += mts + +$(foreach module, $(mts_modules), $(eval mts_test_suites += mts-$(module))) + +$(foreach suite, $(mts_test_suites), \ + $(eval test_suite_name := $(suite)) \ + $(eval test_suite_tradefed := mts-tradefed) \ + $(eval test_suite_readme := test/mts/README.md) \ + $(eval include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk) \ + $(eval .PHONY: $(suite)) \ + $(eval $(suite): $(compatibility_zip)) \ + $(eval $(call dist-for-goals, $(suite), $(compatibility_zip))) \ +) -.PHONY: mts -mts: $(compatibility_zip) -$(call dist-for-goals, mts, $(compatibility_zip)) endif diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 6ac90d8d35..e610490f44 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2021-01-05 + PLATFORM_SECURITY_PATCH := 2021-02-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 4569bceff9..6fee023689 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -315,44 +315,12 @@ PRODUCT_HOST_PACKAGES += \ tz_version_host \ tz_version_host_tzdata_apex \ -ifeq ($(ART_APEX_JARS),) -$(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) -endif - -# The order matters for runtime class lookup performance. -PRODUCT_BOOT_JARS := \ - $(ART_APEX_JARS) \ - framework-minus-apex \ - ext \ - telephony-common \ - voip-common \ - ims-common - -PRODUCT_UPDATABLE_BOOT_JARS := \ - com.android.conscrypt:conscrypt \ - com.android.media:updatable-media \ - com.android.mediaprovider:framework-mediaprovider \ - com.android.os.statsd:framework-statsd \ - com.android.permission:framework-permission \ - com.android.sdkext:framework-sdkextensions \ - com.android.wifi:framework-wifi \ - com.android.tethering:framework-tethering PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \ system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \ system/core/rootdir/etc/hosts:system/etc/hosts -# Add the compatibility library that is needed when android.test.base -# is removed from the bootclasspath. -# Default to excluding android.test.base from the bootclasspath. -ifneq ($(REMOVE_ATB_FROM_BCP),false) -PRODUCT_PACKAGES += framework-atb-backward-compatibility -PRODUCT_BOOT_JARS += framework-atb-backward-compatibility -else -PRODUCT_BOOT_JARS += android.test.base -endif - PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32 @@ -408,4 +376,5 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects) +$(call inherit-product, $(SRC_TARGET_DIR)/product/bootclasspath.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) diff --git a/target/product/bootclasspath.mk b/target/product/bootclasspath.mk new file mode 100644 index 0000000000..a06b3b3d63 --- /dev/null +++ b/target/product/bootclasspath.mk @@ -0,0 +1,48 @@ +# +# Copyright (C) 2020 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. +# + +ifeq ($(ART_APEX_JARS),) + $(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) +endif + +# The order matters for runtime class lookup performance. +PRODUCT_BOOT_JARS := \ + $(ART_APEX_JARS) \ + framework-minus-apex \ + ext \ + telephony-common \ + voip-common \ + ims-common + +PRODUCT_UPDATABLE_BOOT_JARS := \ + com.android.conscrypt:conscrypt \ + com.android.media:updatable-media \ + com.android.mediaprovider:framework-mediaprovider \ + com.android.os.statsd:framework-statsd \ + com.android.permission:framework-permission \ + com.android.sdkext:framework-sdkextensions \ + com.android.wifi:framework-wifi \ + com.android.tethering:framework-tethering + +# Add the compatibility library that is needed when android.test.base +# is removed from the bootclasspath. +# Default to excluding android.test.base from the bootclasspath. +ifneq ($(REMOVE_ATB_FROM_BCP),false) + PRODUCT_PACKAGES += framework-atb-backward-compatibility + PRODUCT_BOOT_JARS += framework-atb-backward-compatibility +else + PRODUCT_BOOT_JARS += android.test.base +endif |