From 256827eaf32b2e4f2e237a866a39a87f0a64584e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0trobl?= <recordyletsplays@gmail.com>
Date: Sun, 18 Jul 2021 18:40:41 +0200
Subject: [PATCH] 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.
---
 BoardConfigCommon.mk | 2 ++
 sdm660.mk            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6c658001..bdc832c9 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -22,6 +22,8 @@ endif
 # APEX image
 ifeq ($(ENABLE_APEX), true)
 DEXPREOPT_GENERATE_APEX_IMAGE := true
+else
+OVERRIDE_TARGET_FLATTEN_APEX := true
 endif
 
 # ANT+
diff --git a/sdm660.mk b/sdm660.mk
index e903941a..8569a181 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -20,6 +20,8 @@ ifeq ($(ENABLE_APEX), true)
 TARGET_SUPPORTS_UPDATABLE_APEX := true
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 $(call inherit-product-if-exists, vendor/prebuilts/config/apex.mk)
+else
+PRODUCT_PRODUCT_PROPERTIES += ro.apex.updatable=false
 endif
 
 # Inherit proprietary files