diff options
author | Anton Hansson <hansson@google.com> | 2020-12-14 15:09:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-14 15:09:54 +0000 |
commit | 103a525c66e8e14d275449c63eccd726c1ad8b66 (patch) | |
tree | af2761206bf4e69fbc936e4a5078d63e30f379cd | |
parent | dbb9218184efe63b7f5a46acccf5cb0440cf7bdc (diff) | |
parent | 1a9d81a06b7c794b297c13bc2d57f38c5f522b09 (diff) | |
download | build-103a525c66e8e14d275449c63eccd726c1ad8b66.tar.gz |
Merge "Add bootclasspath config to its own makefile" into mainline-prod
-rw-r--r-- | target/product/base_system.mk | 33 | ||||
-rw-r--r-- | target/product/bootclasspath.mk | 48 |
2 files changed, 49 insertions, 32 deletions
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 |