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

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

Merge "Use erofs if RELEASE_APEX_USE_EROFS_PREINSTALLED" into main

parents 430fcf64 03edf267
Loading
Loading
Loading
Loading
+13 −2
Original line number Diff line number Diff line
@@ -543,12 +543,23 @@ else ifeq (,$(PRODUCT_COMPRESSED_APEX))
  PRODUCT_COMPRESSED_APEX := true
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
  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
  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := $(_default_payload_fs_type)
endif
_default_payload_fs_type :=

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