From 757912aaad664c89ab80854741a619038ffa17cf Mon Sep 17 00:00:00 2001
From: Ramii Ahmed <ramy@ahmedramy.com>
Date: Fri, 29 Jan 2021 03:59:45 +0000
Subject: [PATCH] sm6250-common: Re-enable Updatable Apexes

---
 BoardConfigCommon.mk | 3 +++
 common.mk            | 5 +++++
 system.prop          | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d38ca57..970125b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -8,6 +8,9 @@ COMMON_PATH := device/xiaomi/sm6250-common
 
 BUILD_BROKEN_DUP_RULES := true
 
+# APEX image
+DEXPREOPT_GENERATE_APEX_IMAGE := true
+
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
diff --git a/common.mk b/common.mk
index 0ae6013..3036e14 100644
--- a/common.mk
+++ b/common.mk
@@ -17,6 +17,9 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 PRODUCT_PACKAGES += \
     fs_config_files
 
+# Apex
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 # API
 PRODUCT_SHIPPING_API_LEVEL := 29
 
@@ -374,6 +377,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libhidlcache.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhidlcache.so
 
+PRODUCT_EXTRA_VNDK_VERSIONS := 29
+
 # Vulkan
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
diff --git a/system.prop b/system.prop
index d77ad39..7afea3a 100644
--- a/system.prop
+++ b/system.prop
@@ -1,3 +1,6 @@
+# Apex
+ro.apex.updatable=true
+
 # Audio
 media.stagefright.audio.sink=384
 af.fast.track.multiplier=2