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

Commit a90f1aff authored by Jooyung Han's avatar Jooyung Han Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Use erofs if RELEASE_APEX_USE_EROFS_PREINSTALLED"" into main

parents 358f4ce7 a784a1c4

core/product_config.mk

+13 −2
Original line number Original line Diff line number Diff line
@@ -551,12 +551,23 @@ else ifeq (,$(PRODUCT_COMPRESSED_APEX)) 
  PRODUCT_COMPRESSED_APEX := $(_default_compressed_apex)

  PRODUCT_COMPRESSED_APEX := $(_default_compressed_apex)

endif

endif





###########################################

# Set the default payload type for APEXes

#

_default_payload_fs_type := ext4

ifeq (true,$(RELEASE_APEX_USE_EROFS_PREINSTALLED))

  _default_payload_fs_type := erofs

endif



# Default APEX payload type can be forcibly set with

# OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE.

ifdef OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE

ifdef OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := $(OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE)

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := $(OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE)

else ifeq ($(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 := $(_default_payload_fs_type)

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := ext4

endif

endif

_default_payload_fs_type :=



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

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

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

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

    not $(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE).)

    not $(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE).)