Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d7f9cb2 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Remove TARGET_FLATTEN_APEX" into main

parents fb4fb4b7 0d500c58

core/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -5775,9 +5775,6 @@ endif 
ifeq ($(BUILDING_WITH_VSDK),true)

	$(hide) echo "building_with_vsdk=true" >> $@

endif

ifeq ($(TARGET_FLATTEN_APEX),false)

	$(hide) echo "target_flatten_apex=false" >> $@

endif



$(call declare-0p-target,$(INSTALLED_FASTBOOT_INFO_TARGET))

core/board_config.mk

+0 −18
Original line number Diff line number Diff line
@@ -971,24 +971,6 @@ ifneq ($(BOARD_VNDK_VERSION),current) 
endif

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))

ifdef PRODUCT_EXTRA_VNDK_VERSIONS

  $(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))

target/product/base_system.mk

+3 −0
Original line number Diff line number Diff line
@@ -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)



$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)



# Use "image" APEXes always.

$(call inherit-product,$(SRC_TARGET_DIR)/product/updatable_apex.mk)

target/product/updatable_apex.mk

+9 −13
Original line number Diff line number Diff line
@@ -14,17 +14,13 @@ 
# limitations under the License.

#



# Inherit this when the target needs to support updating APEXes



ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)

# 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

  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