dont ask me

device.mk

@@ -8,6 +8,10 @@
 $(call soong_config_set,rfs,mpss_firmware_symlink_target,firmware_modem)
 $(call inherit-product, hardware/qcom-caf/common/common.mk)
 
+# ART
+$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 # Enable project quotas and casefolding for emulated storage without sdcardfs
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
@@ -22,6 +26,27 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
 
 # AAPT
 PRODUCT_AAPT_CONFIG := normal
+
+PRODUCT_SOONG_NAMESPACES += \
+    frameworks/base/apex/com.android.art \
+    frameworks/base/apex/com.android.runtime \
+    frameworks/base/apex/com.android.conscrypt \
+    frameworks/base/apex/com.android.i18n \
+    frameworks/base/apex/com.android.tzdata
+
+PRODUCT_PACKAGES += \
+    com.android.art \
+    com.android.runtime \
+    com.android.conscrypt \
+    com.android.i18n \
+    com.android.tzdata
+
+# com.android.art und com.android.runtime beim Packaging entpacken
+PRODUCT_UNPACK_APEX += \
+    com.android.art \
+    com.android.runtime
+
+
 PRODUCT_AAPT_PREF_CONFIG := xxxhdpi
 
 # API levels
@@ -31,11 +56,18 @@ PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL)
 # No A/B
 AB_OTA_UPDATER := false
 
+# APEX
+TARGET_BUILD_ART_APEX := true
+
+
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.audio@7.1-impl.samsung-sm8650 \
     android.hardware.audio.effect@7.0-impl \
     android.hardware.audio.service \
+    android.hardware.audio.service_64 \
+    pm-proxy \
+    secaudiohalaidl \
     android.hardware.bluetooth.audio-impl \
     android.hardware.soundtrigger@2.3-impl \
     audio.bluetooth.default \
@@ -319,6 +351,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \
     frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml
 
+# Shim
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/rootdir/system/bin/app_process32:system/bin/app_process32
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \