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

Commit 2ffe4dea authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Add a switch to configure APEX payload type" into main

parents 729e46f3 fea93527

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -284,6 +284,9 @@ _product_list_vars += PRODUCT_EXTRA_VNDK_VERSIONS 
# Whether APEX should be compressed or not

_product_single_value_vars += PRODUCT_COMPRESSED_APEX



# Default fs type for APEX payload image (apex_payload.img)

_product_single_value_vars += PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE



# VNDK version of product partition. It can be 'current' if the product

# partitions uses PLATFORM_VNDK_VERSION.

_product_single_value_vars += PRODUCT_PRODUCT_VNDK_VERSION

core/product_config.mk

+11 −0
Original line number Diff line number Diff line
@@ -534,6 +534,17 @@ ifdef OVERRIDE_PRODUCT_COMPRESSED_APEX 
  PRODUCT_COMPRESSED_APEX := $(OVERRIDE_PRODUCT_COMPRESSED_APEX)

endif



ifdef OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := $(OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE)

else ifeq ($(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE),)

  # Use ext4 as a default payload fs type

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := ext4

endif

ifeq ($(filter ext4 erofs,$(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE)),)

  $(error PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE should be either erofs or ext4,\

    not $(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE).)

endif



$(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \

    ,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ $(call add_json_bool, EnforceProductPartitionInterface, $(filter true,$(PRODUCT 
$(call add_json_str,  DeviceCurrentApiLevelForVendorModules,  $(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES))



$(call add_json_bool, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX)))

$(call add_json_str, DefaultApexPayloadType, $(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE))



$(call add_json_bool, BoardUsesRecoveryAsBoot, $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))