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

Commit f7b29ef6 authored by Chaitanya Cheemala (xWF)'s avatar Chaitanya Cheemala (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Use erofs if RELEASE_APEX_USE_EROFS_PREINSTALLED" 

Revert submission 32730183-erofs-apex-compression

Reason for revert: Likely culprit for b/411041000 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:32730183-erofs-apex-compression

Change-Id: Iee548506d1c12618a89f440e7bf50e5b0c99e231
parent 03edf267

core/product_config.mk

+2 −13
Original line number Diff line number Diff line
@@ -543,23 +543,12 @@ 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),)

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := $(_default_payload_fs_type)

  # Use ext4 as a default payload fs type

  PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE := ext4

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