sdm660-common: Flatten APEXes if updatable APEX is not present

* Should fix bootloops on ROMs which require APEX to boot, such as EvoX

* If APEX is being flattened, disable it manually as well since some ROMs have it enabled by default, even if we flatten it.
This commit is contained in:
Martin Štrobl 2021-07-18 18:40:41 +02:00 committed by pix106
parent e9c9caeaa3
commit 256827eaf3
2 changed files with 4 additions and 0 deletions

View file

@ -22,6 +22,8 @@ endif
# APEX image # APEX image
ifeq ($(ENABLE_APEX), true) ifeq ($(ENABLE_APEX), true)
DEXPREOPT_GENERATE_APEX_IMAGE := true DEXPREOPT_GENERATE_APEX_IMAGE := true
else
OVERRIDE_TARGET_FLATTEN_APEX := true
endif endif
# ANT+ # ANT+

View file

@ -20,6 +20,8 @@ ifeq ($(ENABLE_APEX), true)
TARGET_SUPPORTS_UPDATABLE_APEX := true TARGET_SUPPORTS_UPDATABLE_APEX := true
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
$(call inherit-product-if-exists, vendor/prebuilts/config/apex.mk) $(call inherit-product-if-exists, vendor/prebuilts/config/apex.mk)
else
PRODUCT_PRODUCT_PROPERTIES += ro.apex.updatable=false
endif endif
# Inherit proprietary files # Inherit proprietary files