StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove TARGET_FLATTEN_APEX

Browse Source 
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
This commit is contained in:
Jooyung Han
2023-08-25 15:02:50 +09:00
parent 78ecdf05c4
commit 0d500c58aa
4 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@@ -5774,9 +5774,6 @@ endif
ifeq ($(BUILDING_WITH_VSDK),true) ifeq ($(BUILDING_WITH_VSDK),true)
$(hide) echo "building_with_vsdk=true" >> $@ $(hide) echo "building_with_vsdk=true" >> $@
endif endif
ifeq ($(TARGET_FLATTEN_APEX),false)
$(hide) echo "target_flatten_apex=false" >> $@
endif
$(call declare-0p-target,$(INSTALLED_FASTBOOT_INFO_TARGET)) $(call declare-0p-target,$(INSTALLED_FASTBOOT_INFO_TARGET))

18
core/board_config.mk
View File

@@ -971,24 +971,6 @@ ifneq ($(BOARD_VNDK_VERSION),current)
endif endif
TARGET_VENDOR_TEST_SUFFIX := /vendor TARGET_VENDOR_TEST_SUFFIX := /vendor
###########################################
# APEXes are by default not flattened, i.e. updatable.
#
# APEX flattening can also be forcibly enabled (resp. disabled) by
# setting OVERRIDE_TARGET_FLATTEN_APEX to true (resp. false), e.g. by
# setting the OVERRIDE_TARGET_FLATTEN_APEX environment variable.
ifdef OVERRIDE_TARGET_FLATTEN_APEX
TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX)
endif
# TODO(b/278826656) Remove the following message
ifeq (true,$(TARGET_FLATTEN_APEX))
$(warning ********************************************************************************)
$(warning Flattened APEX will be deprecated soon. Please stop using flattened APEX and use)
$(warning "image" APEX instead.)
$(warning ********************************************************************************)
endif
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))
ifdef PRODUCT_EXTRA_VNDK_VERSIONS ifdef PRODUCT_EXTRA_VNDK_VERSIONS
$(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v))) $(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))

3
target/product/base_system.mk
View File

@@ -432,3 +432,6 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects) frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
# Use "image" APEXes always.
$(call inherit-product,$(SRC_TARGET_DIR)/product/updatable_apex.mk)

22
target/product/updatable_apex.mk
View File

@@ -14,17 +14,13 @@
# limitations under the License. # limitations under the License.
# #
# Inherit this when the target needs to support updating APEXes # com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt
# and CtsShimPrivPrebuilt since they are packaged inside the APEX.
PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt
PRODUCT_SYSTEM_PROPERTIES := ro.apex.updatable=true
ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true) # Use compressed apexes in pre-installed partitions.
# com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt # Note: this doesn't mean that all pre-installed apexes will be compressed.
# and CtsShimPrivPrebuilt since they are packaged inside the APEX. # Whether an apex is compressed or not is controlled at apex Soong module
PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt # via compresible property.
PRODUCT_SYSTEM_PROPERTIES := ro.apex.updatable=true PRODUCT_COMPRESSED_APEX := true
TARGET_FLATTEN_APEX := false
# Use compressed apexes in pre-installed partitions.
# Note: this doesn't mean that all pre-installed apexes will be compressed.
# Whether an apex is compressed or not is controlled at apex Soong module
# via compresible property.
PRODUCT_COMPRESSED_APEX := true
endif