sm8250-common: Build all buildable vendor blobs from source

Change-Id: Ic6f102c6e9f2c28fe02e100f11788175bf5f64f1

3 files changed, 431 insertions, 37 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3874464..c72c4e8 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -37,10 +37,29 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := kryo385
 
 TARGET_USES_64_BIT_BINDER := true
 
+# Audio
+AUDIO_FEATURE_ENABLED_AHAL_EXT := false
+AUDIO_FEATURE_ENABLED_DLKM := true
+AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false
+AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
+AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false
+AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
+AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
+AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
+AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
+AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
+AUDIO_FEATURE_ENABLED_SSR := false
+BOARD_SUPPORTS_SOUND_TRIGGER := true
+BOARD_SUPPORTS_OPENSOURCE_STHAL := true
+BOARD_USES_ALSA_AUDIO := true
+
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := kona
 TARGET_NO_BOOTLOADER := true
 
+# Camera
+TARGET_USES_QTI_CAMERA_DEVICE := true
+
 # Kernel
 BOARD_BOOT_HEADER_VERSION := 2
 BOARD_KERNEL_BASE := 0x00000000
@@ -132,6 +151,7 @@ TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true
 TARGET_USES_DISPLAY_RENDER_INTENTS := true
 TARGET_USES_DRM_PP := true
 TARGET_USES_GRALLOC1 := true
+TARGET_USES_GRALLOC4 := true
 TARGET_USES_HWC2 := true
 TARGET_USES_ION := true
 
@@ -189,6 +209,9 @@ TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 TARGET_USES_MKE2FS := true
 
+# RIL
+ENABLE_VENDOR_RIL_SERVICE := true
+
 # Root
 BOARD_ROOT_EXTRA_FOLDERS := \
     ADF \
diff --git a/common.mk b/common.mk
index 03714fd..bed61b5 100644
--- a/common.mk
+++ b/common.mk
@@ -70,11 +70,54 @@ AB_OTA_POSTINSTALL_CONFIG += \
 
 # ANT+
 PRODUCT_PACKAGES += \
-    AntHalService-Soong
+    AntHalService-Soong \
+    com.dsi.ant@1.0.vendor
+
+# Atrace
+PRODUCT_PACKAGES += \
+    android.hardware.atrace@1.0-service
 
 # Audio
 PRODUCT_PACKAGES += \
-    audio.a2dp.default
+    android.hardware.audio@6.0-impl \
+    android.hardware.audio.effect@6.0-impl \
+    android.hardware.audio.service \
+    android.hardware.bluetooth.audio@2.0-impl \
+    android.hardware.soundtrigger@2.2-impl \
+    audio.a2dp.default \
+    audio.bluetooth.default \
+    audio.primary.kona \
+    audio.r_submix.default \
+    audio.usb.default \
+    audio_amplifier.kona \
+    liba2dpoffload \
+    libaudiopreprocessing \
+    libbatterylistener \
+    libbundlewrapper \
+    libcirrusspkrprot \
+    libcomprcapture \
+    libdownmix \
+    libdynproc \
+    libeffectproxy \
+    libexthwplugin \
+    libhdmiedid \
+    libhfp \
+    libldnhncr \
+    libqcompostprocbundle \
+    libqcomvisualizer \
+    libqcomvoiceprocessing \
+    libreverbwrapper \
+    libsndmonitor \
+    libspkrprot \
+    libvisualizer \
+    libvolumelistener \
+    sound_trigger.primary.kona
+
+# Bluetooth
+PRODUCT_PACKAGES += \
+    com.qualcomm.qti.bluetooth_audio@1.0.vendor \
+    vendor.qti.hardware.bluetooth_audio@2.0.vendor \
+    vendor.qti.hardware.btconfigstore@1.0.vendor
 
 # Boot control
 PRODUCT_PACKAGES += \
@@ -87,6 +130,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES_DEBUG += \
     bootctl
 
+# Camera
+PRODUCT_PACKAGES += \
+    android.hardware.camera.provider@2.4-impl \
+    android.hardware.camera.provider@2.4-service_64 \
+    vendor.qti.hardware.camera.device@1.0.vendor \
+    vendor.qti.hardware.camera.postproc@1.0.vendor
+
 # Common init scripts
 PRODUCT_PACKAGES += \
     init.asus.usb.rc \
@@ -102,14 +152,21 @@ PRODUCT_COPY_FILES += \
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
-    vendor.qti.hardware.display.allocator-service \
-    vendor.qti.hardware.display.composer-service \
+    android.hardware.graphics.mapper@4.0-impl-qti-display \
     android.hardware.memtrack@1.0-impl \
     android.hardware.memtrack@1.0-service \
+    android.hardware.renderscript@1.0-impl \
     gralloc.kona \
-    memtrack.kona \
+    libdisplayconfig.qti.vendor \
     libqdMetaData \
-    libdisplayconfig.vendor \
+    libqdutils \
+    libqservice \
+    libsdmcore \
+    libsdmutils \
+    libtinyxml \
+    libvulkan \
+    lights.kona \
+    memtrack.kona \
     vendor.display.config@1.0.vendor \
     vendor.display.config@1.1.vendor \
     vendor.display.config@1.2.vendor \
@@ -122,16 +179,28 @@ PRODUCT_PACKAGES += \
     vendor.display.config@1.9.vendor \
     vendor.display.config@1.10.vendor \
     vendor.display.config@1.11.vendor \
-    vendor.display.config@1.12.vendor \
-    vendor.display.config@1.13.vendor \
-    vendor.display.config@1.14.vendor \
-    vendor.display.config@1.15.vendor \
+    vendor.display.config@2.0.vendor \
+    vendor.qti.hardware.display.allocator-service \
+    vendor.qti.hardware.display.composer-service \
     vendor.qti.hardware.display.mapper@1.0.vendor \
+    vendor.qti.hardware.display.mapper@1.1.vendor \
     vendor.qti.hardware.display.mapper@2.0.vendor \
-    vendor.qti.hardware.display.mapper@3.0.vendor
+    vendor.qti.hardware.display.mapper@3.0.vendor \
+    vendor.qti.hardware.display.mapper@4.0.vendor
+
+PRODUCT_PACKAGES += \
+    libdisplayconfig.qti \
+    vendor.display.config@1.0 \
+    vendor.display.config@2.0
+
+# DRM
+PRODUCT_PACKAGES += \
+    android.hardware.drm@1.3-service.clearkey
 
+# Health
 PRODUCT_PACKAGES += \
-    vendor.display.config@1.12
+    android.hardware.health@2.1-impl \
+    android.hardware.health@2.1-service
 
 # HIDL
 PRODUCT_PACKAGES += \
@@ -144,17 +213,34 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     fastbootd
 
+# Fingerprint
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service
+
 # Hotword Enrollement
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/hotword-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hotword-hiddenapi-package-whitelist.xml \
     $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
 
+# IPACM
+PRODUCT_PACKAGES += \
+    ipacm \
+    IPACM_cfg.xml \
+    libipanat:64 \
+    liboffloadhal:64
+
 # NFC
 PRODUCT_PACKAGES += \
     NfcNci \
     Tag \
     SecureElement \
-    com.android.nfc_extras
+    com.android.nfc_extras \
+    libchrome.vendor \
+    ese_spi_nxp \
+    vendor.nxp.hardware.nfc@2.0.vendor \
+    vendor.nxp.nxpese@1.0.vendor \
+    vendor.nxp.nxpnfc@1.0.vendor \
+    vendor.nxp.nxpnfclegacy@1.0.vendor
 
 # Net
 PRODUCT_PACKAGES += \
@@ -162,6 +248,7 @@ PRODUCT_PACKAGES += \
 
 # Omx
 PRODUCT_PACKAGES += \
+    init.qti.media.sh \
     libc2dcolorconvert \
     libcodec2_hidl@1.0.vendor \
     libcodec2_vndk.vendor \
@@ -175,20 +262,44 @@ PRODUCT_PACKAGES += \
     libOmxVdec \
     libOmxVenc \
     libOmxVidcCommon \
-    libstagefrighthw
+    libstagefrighthw \
+    libwfdaac_vendor
+
+PRODUCT_PACKAGES += \
+    libavservices_minijail \
+    libavservices_minijail.vendor \
+    libavservices_minijail_vendor:32
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service-qti
+    android.hardware.power-service-qti \
+    vendor.qti.hardware.perf@2.0.vendor
+
+# QMI
+PRODUCT_PACKAGES += \
+    libjson \
+    libqti_vndfwk_detect \
+    libqti_vndfwk_detect.vendor \
+    libvndfwk_detect_jni.qti \
+    libvndfwk_detect_jni.qti.vendor \
+    vendor.qti.hardware.systemhelper@1.0 \
+    vendor.qti.hardware.systemhelper@1.0.vendor
+
+# RIL
+PRODUCT_PACKAGES += \
+    libprotobuf-cpp-full \
+    librmnetctl
+
+# Sensors
+PRODUCT_PACKAGES += \
+    android.hardware.sensors@2.0-service.multihal \
+    android.hardware.sensors@2.0-ScopedWakelock.vendor \
+    libsensorndkbridge:64
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
-# System Helper
-PRODUCT_PACKAGES += \
-    vendor.qti.hardware.systemhelper@1.0
-
 # Telephony
 PRODUCT_PACKAGES += \
     ims-ext-common \
@@ -198,6 +309,10 @@ PRODUCT_PACKAGES += \
     qti-telephony-utils \
     qti_telephony_utils.xml
 
+# Thermal
+PRODUCT_PACKAGES += \
+    android.hardware.thermal@2.0-service.qti
+
 # Trust HAL
 PRODUCT_PACKAGES += \
     vendor.lineage.trust@1.0-service
@@ -211,6 +326,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES_DEBUG += \
     update_engine_client
 
+# USB
+PRODUCT_PACKAGES += \
+    android.hardware.usb@1.2-service-qti \
+    libusb.vendor:64
+
 PRODUCT_BUILD_SUPER_PARTITION := false
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
@@ -228,8 +348,10 @@ PRODUCT_PACKAGES += \
     libwpa_client \
     libwifi-hal-ctrl \
     libwifi-hal-qcom \
+    vendor.qti.hardware.fstman@1.0.vendor:64 \
     vendor.qti.hardware.wifi.hostapd@1.0.vendor \
     vendor.qti.hardware.wifi.hostapd@1.1.vendor \
+    vendor.qti.hardware.wifi.hostapd@1.2.vendor \
     vendor.qti.hardware.wifi.supplicant@2.0.vendor \
     vendor.qti.hardware.wifi.supplicant@2.1.vendor \
     wpa_supplicant \
diff --git a/regen-vendor.sh b/regen-vendor.sh
index e7412c3..0ae351f 100644
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -221,8 +221,12 @@ VENDOR_SKIP_FILES_COMMON=(
     "bin/yes"
     "bin/zcat"
 
-    # Tools
+    # Utils
     "bin/awk"
+    "bin/applypatch"
+    "bin/boringssl_self_test32"
+    "bin/boringssl_self_test64"
+    "etc/init/boringssl_self_test.rc"
     "bin/checkpoint_gc"
     "bin/cplay"
     "bin/dumpsys"
@@ -231,6 +235,7 @@ VENDOR_SKIP_FILES_COMMON=(
     "bin/sh"
     "bin/mm-vidc-omx-test"
     "etc/mkshrc"
+    "etc/init/vendor_flash_recovery.rc"
 
     # config.fs
     "etc/fs_config_dirs"
@@ -278,6 +283,7 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib/modules/ml51fb9ae_inbox.ko"
     "lib/modules/modules.alias"
     "lib/modules/modules.dep"
+    "lib/modules/modules.load"
     "lib/modules/modules.softdep"
     "lib/modules/mpq-adapter.ko"
     "lib/modules/mpq-dmx-hw-plugin.ko"
@@ -305,12 +311,18 @@ VENDOR_SKIP_FILES_COMMON=(
     "bin/vndservice"
     "bin/vndservicemanager"
     "etc/init/vndservicemanager.rc"
+    "lib64/libhwminijail.so"
     "lib/libhwminijail.so"
     "lib/libgui_vendor.so"
     "etc/vintf/manifest/manifest.xml"
+    "lib64/libhidltransport.so"
+    "lib/libhidltransport.so"
+    "lib64/libhwbinder.so"
+    "lib/libhwbinder.so"
 
     # Sepolicy
     "etc/selinux/vendor_file_contexts"
+    "etc/selinux/vendor_service_contexts"
     "etc/selinux/nonplat_file_contexts"
     "etc/selinux/nonplat_hwservice_contexts"
     "etc/selinux/nonplat_mac_permissions.xml"
@@ -328,6 +340,7 @@ VENDOR_SKIP_FILES_COMMON=(
     "etc/selinux/vendor_property_contexts"
     "etc/selinux/vendor_seapp_contexts"
     "etc/selinux/vendor_sepolicy.cil"
+    "etc/selinux/selinux_denial_metadata"
 
     # Symlinks
     "app/CneApp/lib/arm64/libvndfwk_detect_jni.qti.so"
@@ -447,6 +460,8 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib/hw/power.default.so"
     "lib64/hw/vibrator.default.so"
     "lib/hw/vibrator.default.so"
+    "lib64/hw/gralloc.default.so"
+    "lib/hw/gralloc.default.so"
 
     # Wifi
     "bin/hostapd_cli"
@@ -466,12 +481,38 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib64/libwpa_client.so"
     "lib64/vendor.qti.hardware.wifi.hostapd@1.0.so"
     "lib64/vendor.qti.hardware.wifi.hostapd@1.1.so"
+    "lib64/vendor.qti.hardware.wifi.hostapd@1.2.so"
     "lib64/vendor.qti.hardware.wifi.supplicant@2.0.so"
     "lib64/vendor.qti.hardware.wifi.supplicant@2.1.so"
     "lib64/libcld80211.so"
+    "lib/libcld80211.so"
     "lib64/libkeystore-engine-wifi-hidl.so"
     "lib64/libkeystore-wifi-hidl.so"
 
+    # QMI
+    "lib64/libjson.so"
+    "lib/libjson.so"
+    "lib64/libqti_vndfwk_detect.so"
+    "lib/libqti_vndfwk_detect.so"
+    "lib64/libvndfwk_detect_jni.qti.so"
+    "lib/libvndfwk_detect_jni.qti.so"
+
+    # RIL
+    "lib64/libreference-ril.so"
+    "lib64/libril.so"
+    "lib64/librilutils.so"
+    "lib/libreference-ril.so"
+    "lib/libril.so"
+    "lib/librilutils.so"
+    "lib64/librmnetctl.so"
+    "lib/librmnetctl.so"
+    "lib64/libnetfilter_conntrack.so"
+    "lib64/libnfnetlink.so"
+    "lib64/libprotobuf-cpp-full-3.9.1.so"
+    "lib/libprotobuf-cpp-full-3.9.1.so"
+    "lib64/libprotobuf-cpp-lite-3.9.1.so"
+    "lib/libprotobuf-cpp-lite-3.9.1.so"
+
     # Bootctrl
     "lib/hw/bootctrl.kona.so"
     "lib/hw/android.hardware.boot@1.0-impl-1.1-qti.so"
@@ -489,19 +530,103 @@ VENDOR_SKIP_FILES_COMMON=(
     "bin/hw/android.hardware.power-service"
     "etc/init/android.hardware.power-service.rc"
     "etc/vintf/manifest/power.xml"
+    "lib64/vendor.qti.hardware.perf@2.0.so"
+    "lib/vendor.qti.hardware.perf@2.0.so"
+
+    # Bluetooth
+    "lib/com.qualcomm.qti.bluetooth_audio@1.0.so"
+    "lib/vendor.qti.hardware.bluetooth_audio@2.0.so"
+    "lib/vendor.qti.hardware.btconfigstore@1.0.so"
+    "lib64/com.qualcomm.qti.bluetooth_audio@1.0.so"
+    "lib64/vendor.qti.hardware.bluetooth_audio@2.0.so"
+    "lib64/vendor.qti.hardware.btconfigstore@1.0.so"
+
+    # Audio
+    # Use prebuilt audio.primary.kona
+    # "lib/hw/audio.primary.kona.so"
+    # "lib/liba2dpoffload.so"
+    # "lib64/hw/audio.primary.kona.so"
+    # "lib64/liba2dpoffload.so"
+    "bin/hw/android.hardware.audio.service"
+    "etc/init/android.hardware.audio.service.rc"
+    "lib/android.hardware.audio.common-util.so"
+    "lib/android.hardware.audio.common@2.0-util.so"
+    "lib/android.hardware.audio.common@4.0-util.so"
+    "lib/android.hardware.audio.common@5.0-util.so"
+    "lib/android.hardware.audio.common@6.0-util.so"
+    "lib/hw/android.hardware.audio.effect@2.0-impl.so"
+    "lib/hw/android.hardware.audio.effect@4.0-impl.so"
+    "lib/hw/android.hardware.audio.effect@5.0-impl.so"
+    "lib/hw/android.hardware.audio.effect@6.0-impl.so"
+    "lib/hw/android.hardware.audio@2.0-impl.so"
+    "lib/hw/android.hardware.audio@4.0-impl.so"
+    "lib/hw/android.hardware.audio@5.0-impl.so"
+    "lib/hw/android.hardware.audio@6.0-impl.so"
+    "lib/hw/android.hardware.bluetooth.audio@2.0-impl.so"
+    "lib/hw/android.hardware.soundtrigger@2.1-impl.so"
+    "lib/hw/android.hardware.soundtrigger@2.2-impl.so"
+    "lib/hw/audio.bluetooth.default.so"
+    "lib/hw/audio.r_submix.default.so"
+    "lib/hw/audio.usb.default.so"
+    "lib/hw/sound_trigger.primary.kona.so"
+    "lib/libalsautils.so"
+    "lib/libbluetooth_audio_session.so"
+    "lib/libcirrusspkrprot.so"
+    "lib/libcomprcapture.so"
+    "lib/libexthwplugin.so"
+    "lib/libhdmiedid.so"
+    "lib/libhfp.so"
+    "lib/libnbaio_mono.so"
+    "lib/libsndmonitor.so"
+    "lib/libspkrprot.so"
+    "lib/libtinycompress.so"
+    "lib64/android.hardware.audio.common-util.so"
+    "lib64/android.hardware.audio.common@2.0-util.so"
+    "lib64/android.hardware.audio.common@4.0-util.so"
+    "lib64/android.hardware.audio.common@5.0-util.so"
+    "lib64/android.hardware.audio.common@6.0-util.so"
+    "lib64/hw/android.hardware.audio.effect@2.0-impl.so"
+    "lib64/hw/android.hardware.audio.effect@4.0-impl.so"
+    "lib64/hw/android.hardware.audio.effect@5.0-impl.so"
+    "lib64/hw/android.hardware.audio.effect@6.0-impl.so"
+    "lib64/hw/android.hardware.audio@2.0-impl.so"
+    "lib64/hw/android.hardware.audio@4.0-impl.so"
+    "lib64/hw/android.hardware.audio@5.0-impl.so"
+    "lib64/hw/android.hardware.audio@6.0-impl.so"
+    "lib64/hw/android.hardware.bluetooth.audio@2.0-impl.so"
+    "lib64/hw/android.hardware.soundtrigger@2.2-impl.so"
+    "lib64/hw/audio.bluetooth.default.so"
+    "lib64/hw/audio.r_submix.default.so"
+    "lib64/hw/audio.usb.default.so"
+    "lib64/hw/sound_trigger.primary.kona.so"
+    "lib64/libalsautils.so"
+    "lib64/libbluetooth_audio_session.so"
+    "lib64/libcirrusspkrprot.so"
+    "lib64/libcomprcapture.so"
+    "lib64/libexthwplugin.so"
+    "lib64/libhdmiedid.so"
+    "lib64/libhfp.so"
+    "lib64/libnbaio_mono.so"
+    "lib64/libsndmonitor.so"
+    "lib64/libspkrprot.so"
+    "lib64/libtinycompress.so"
 
-    # Display (we keep sdmcore prebuilt)
+    # Display
     "etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml"
     "lib64/hw/android.hardware.graphics.mapper@3.0-impl-qti-display.so"
+    "lib64/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so"
     "lib/hw/android.hardware.graphics.mapper@3.0-impl-qti-display.so"
+    "lib/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so"
     "lib64/vendor.qti.hardware.display.mapper@1.0.so"
     "lib64/vendor.qti.hardware.display.mapper@1.1.so"
     "lib64/vendor.qti.hardware.display.mapper@2.0.so"
     "lib64/vendor.qti.hardware.display.mapper@3.0.so"
+    "lib64/vendor.qti.hardware.display.mapper@4.0.so"
     "lib/vendor.qti.hardware.display.mapper@1.0.so"
     "lib/vendor.qti.hardware.display.mapper@1.1.so"
     "lib/vendor.qti.hardware.display.mapper@2.0.so"
     "lib/vendor.qti.hardware.display.mapper@3.0.so"
+    "lib/vendor.qti.hardware.display.mapper@4.0.so"
     "lib64/vendor.qti.hardware.display.mapperextensions@1.0.so"
     "lib64/vendor.qti.hardware.display.mapperextensions@1.1.so"
     "lib/vendor.qti.hardware.display.mapperextensions@1.0.so"
@@ -511,11 +636,23 @@ VENDOR_SKIP_FILES_COMMON=(
     "bin/hw/vendor.qti.hardware.display.allocator-service"
     "lib64/vendor.qti.hardware.display.allocator@1.0.so"
     "lib64/vendor.qti.hardware.display.allocator@3.0.so"
+    "lib64/vendor.qti.hardware.display.allocator@4.0.so"
     "lib/vendor.qti.hardware.display.allocator@1.0.so"
     "lib/vendor.qti.hardware.display.allocator@3.0.so"
+    # Use prebuilt composer for PixelWorks Iris
+    # "bin/hw/vendor.qti.hardware.display.composer-service"
+    # "lib64/libsdedrm.so"
+    # "lib64/libsdmcore.so"
+    # "lib64/libsdmutils.so"
+    # "lib/libsdedrm.so"
+    # "lib/libsdmcore.so"
+    # "lib/libsdmutils.so"
+    "etc/init/vendor.qti.hardware.display.composer-service.rc"
+    "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"
     "lib64/vendor.qti.hardware.display.composer@1.0.so"
     "lib64/vendor.qti.hardware.display.composer@2.0.so"
     "lib64/vendor.qti.hardware.display.composer@2.1.so"
+    "lib64/vendor.qti.hardware.display.composer@3.0.so"
     "lib/vendor.qti.hardware.display.composer@1.0.so"
     "lib/vendor.qti.hardware.display.composer@2.0.so"
     "lib/vendor.qti.hardware.display.composer@2.1.so"
@@ -523,14 +660,16 @@ VENDOR_SKIP_FILES_COMMON=(
     "bin/hw/android.hardware.memtrack@1.0-service"
     "lib64/hw/android.hardware.memtrack@1.0-impl.so"
     "lib/hw/android.hardware.memtrack@1.0-impl.so"
+    "lib64/hw/android.hardware.renderscript@1.0-impl.so"
+    "lib/hw/android.hardware.renderscript@1.0-impl.so"
     "lib64/hw/gralloc.kona.so"
     "lib/hw/gralloc.kona.so"
     "lib64/hw/memtrack.kona.so"
     "lib/hw/memtrack.kona.so"
+    "lib64/hw/lights.kona.so"
+    "lib/hw/lights.kona.so"
     "lib64/libqdMetaData.so"
     "lib/libqdMetaData.so"
-    "lib64/libdisplayconfig.so"
-    "lib/libdisplayconfig.so"
     "lib64/vendor.display.config@1.0.so"
     "lib64/vendor.display.config@1.1.so"
     "lib64/vendor.display.config@1.10.so"
@@ -547,6 +686,7 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib64/vendor.display.config@1.7.so"
     "lib64/vendor.display.config@1.8.so"
     "lib64/vendor.display.config@1.9.so"
+    "lib64/vendor.display.config@2.0.so"
     "lib/vendor.display.config@1.0.so"
     "lib/vendor.display.config@1.1.so"
     "lib/vendor.display.config@1.10.so"
@@ -563,32 +703,42 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib/vendor.display.config@1.7.so"
     "lib/vendor.display.config@1.8.so"
     "lib/vendor.display.config@1.9.so"
-    "lib64/libdisplayconfig.so"
-    "lib64/libdisplaydebug.so"
+    "lib/vendor.display.config@2.0.so"
     "lib64/libdrm.so"
     "lib64/libdrmutils.so"
     "lib64/libgpu_tonemapper.so"
+    "lib64/libgralloc.qti.so"
     "lib64/libgralloccore.so"
     "lib64/libgrallocutils.so"
     "lib64/libqdutils.so"
     "lib64/libqservice.so"
-    "lib64/libdisplayconfig.so"
-    "lib/libdisplaydebug.so"
+    "lib64/libdisplayconfig.qti.so"
+    "lib64/libdisplaydebug.so"
+    "lib64/libhistogram.so"
     "lib/libdrm.so"
     "lib/libdrmutils.so"
     "lib/libgpu_tonemapper.so"
+    "lib/libgralloc.qti.so"
     "lib/libgralloccore.so"
     "lib/libgrallocutils.so"
     "lib/libqdutils.so"
     "lib/libqservice.so"
+    "lib/libdisplayconfig.qti.so"
+    "lib/libdisplaydebug.so"
     "lib/libhistogram.so"
+    "lib64/libtinyxml.so"
+    "lib/libtinyxml.so"
 
     # Media
+    "bin/init.qti.media.sh"
+    "etc/init/init.qti.media.rc"
     "bin/hw/android.hardware.media.omx@1.0-service"
     "etc/init/android.hardware.media.omx@1.0-service.rc"
     "bin/hw/android.hardware.cas@1.2-service"
     "etc/init/android.hardware.cas@1.2-service.rc"
     "etc/vintf/manifest/android.hardware.cas@1.2-service.xml"
+    "lib64/libavservices_minijail.so"
+    "lib/libavservices_minijail.so"
     "lib/libavservices_minijail_vendor.so"
     "lib/libstagefright_amrnb_common.so"
     "lib64/libstagefright_bufferpool@2.0.1.so"
@@ -637,16 +787,24 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib64/soundfx/libdynproc.so"
     "lib64/soundfx/libeffectproxy.so"
     "lib64/soundfx/libldnhncr.so"
+    "lib64/soundfx/libqcompostprocbundle.so"
+    "lib64/soundfx/libqcomvisualizer.so"
+    "lib64/soundfx/libqcomvoiceprocessing.so"
     "lib64/soundfx/libreverbwrapper.so"
     "lib64/soundfx/libvisualizer.so"
+    "lib64/soundfx/libvolumelistener.so"
     "lib/soundfx/libaudiopreprocessing.so"
     "lib/soundfx/libbundlewrapper.so"
     "lib/soundfx/libdownmix.so"
     "lib/soundfx/libdynproc.so"
     "lib/soundfx/libeffectproxy.so"
     "lib/soundfx/libldnhncr.so"
+    "lib/soundfx/libqcompostprocbundle.so"
+    "lib/soundfx/libqcomvisualizer.so"
+    "lib/soundfx/libqcomvoiceprocessing.so"
     "lib/soundfx/libreverbwrapper.so"
     "lib/soundfx/libvisualizer.so"
+    "lib/soundfx/libvolumelistener.so"
     "lib/vndk/libstagefright_foundation.so"
     "lib/vndk/libstagefright_omx.so"
     "lib64/libstagefrighthw.so"
@@ -680,6 +838,107 @@ VENDOR_SKIP_FILES_COMMON=(
     "lib/vendor.qti.hardware.capabilityconfigstore@1.0.so"
     "lib64/libplatformconfig.so"
     "lib/libplatformconfig.so"
+    "lib/libwfdaac_vendor.so"
+
+    # NFC
+    "lib64/ese_spi_nxp.so"
+    "lib/ese_spi_nxp.so"
+    "lib64/vendor.nxp.hardware.nfc@2.0.so"
+    "lib64/vendor.nxp.nxpese@1.0.so"
+    "lib64/vendor.nxp.nxpnfc@1.0.so"
+    "lib64/vendor.nxp.nxpnfclegacy@1.0.so"
+    "lib/vendor.nxp.hardware.nfc@2.0.so"
+    "lib/vendor.nxp.nxpese@1.0.so"
+    "lib/vendor.nxp.nxpnfc@1.0.so"
+    "lib/vendor.nxp.nxpnfclegacy@1.0.so"
+    "lib64/libchrome.so"
+    "lib/libchrome.so"
+
+    # Camera
+    "bin/hw/android.hardware.camera.provider@2.4-service_64"
+    "etc/init/android.hardware.camera.provider@2.4-service_64.rc"
+    "lib64/android.hardware.camera.provider@2.4-external.so"
+    "lib64/android.hardware.camera.provider@2.4-legacy.so"
+    "lib/android.hardware.camera.provider@2.4-external.so"
+    "lib/android.hardware.camera.provider@2.4-legacy.so"
+    "lib64/camera.device@1.0-impl.so"
+    "lib64/camera.device@3.2-impl.so"
+    "lib64/camera.device@3.3-impl.so"
+    "lib64/camera.device@3.4-external-impl.so"
+    "lib64/camera.device@3.4-impl.so"
+    "lib64/camera.device@3.5-external-impl.so"
+    "lib64/camera.device@3.5-impl.so"
+    "lib64/camera.device@3.6-external-impl.so"
+    "lib/camera.device@3.6-external-impl.so"
+    "lib/camera.device@1.0-impl.so"
+    "lib/camera.device@3.2-impl.so"
+    "lib/camera.device@3.3-impl.so"
+    "lib/camera.device@3.4-external-impl.so"
+    "lib/camera.device@3.4-impl.so"
+    "lib/camera.device@3.5-external-impl.so"
+    "lib/camera.device@3.5-impl.so"
+    "lib64/hw/android.hardware.camera.provider@2.4-impl.so"
+    "lib/hw/android.hardware.camera.provider@2.4-impl.so"
+    "lib64/vendor.qti.hardware.camera.device@1.0.so"
+    "lib64/vendor.qti.hardware.camera.postproc@1.0.so"
+    "lib/vendor.qti.hardware.camera.device@1.0.so"
+    "lib/vendor.qti.hardware.camera.postproc@1.0.so"
+
+    # IPACM
+    "bin/ipacm"
+    "etc/init/ipacm.rc"
+    "etc/IPACM_cfg.xml"
+    "lib64/libipanat.so"
+    "lib64/liboffloadhal.so"
+
+    # Sensors
+    # Use prebuilt init.rc which starts the hal with group `input`
+    # "etc/init/android.hardware.sensors@2.0-service-multihal.rc"
+    "bin/hw/android.hardware.sensors@2.0-service.multihal"
+    "etc/vintf/manifest/android.hardware.sensors@2.0-multihal.xml"
+    "lib64/android.hardware.sensors@2.0-ScopedWakelock.so"
+    "lib/android.hardware.sensors@2.0-ScopedWakelock.so"
+    "lib64/libsensorndkbridge.so"
+
+    # Biometrics
+    "bin/hw/android.hardware.biometrics.fingerprint@2.1-service"
+    # Use prebuild init.rc to write the pid for this service to the correct cpuset
+    # "etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc"
+    "etc/vintf/manifest/android.hardware.biometrics.fingerprint@2.1-service.xml"
+
+    # Other services
+    "bin/hw/android.hardware.atrace@1.0-service"
+    "etc/init/android.hardware.atrace@1.0-service.rc"
+    "etc/vintf/manifest/android.hardware.atrace@1.0-service.xml"
+    "bin/hw/android.hardware.configstore@1.1-service"
+    "etc/init/android.hardware.configstore@1.1-service.rc"
+    "etc/seccomp_policy/configstore@1.1.policy"
+    "bin/hw/android.hardware.drm@1.3-service.clearkey"
+    "etc/init/android.hardware.drm@1.3-service.clearkey.rc"
+    "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml"
+    "bin/hw/android.hardware.health@2.1-service"
+    "etc/init/android.hardware.health@2.1-service.rc"
+    "etc/vintf/manifest/android.hardware.health@2.1.xml"
+    "lib64/hw/android.hardware.health@2.0-impl-2.1.so"
+    "lib/hw/android.hardware.health@2.0-impl-2.1.so"
+    "lib64/libbatterylistener.so"
+    "lib/libbatterylistener.so"
+    "bin/hw/android.hardware.thermal@2.0-service.qti"
+    "etc/init/android.hardware.thermal@2.0-service.qti.rc"
+    "etc/vintf/manifest/android.hardware.thermal@2.0-service.qti.xml"
+    "bin/hw/android.hardware.usb@1.2-service-qti"
+    "etc/init/android.hardware.usb@1.2-service-qti.rc"
+    "etc/vintf/manifest/android.hardware.usb@1.2-service.xml"
+    "lib64/libusb.so"
+    "lib64/android.hardware.automotive.vehicle@2.0-manager-lib.so"
+    "lib/android.hardware.automotive.vehicle@2.0-manager-lib.so"
+    "lib64/carwatchdog_aidl_interface-V2-ndk_platform.so"
+    "lib/carwatchdog_aidl_interface-V2-ndk_platform.so"
+    "lib64/com.dsi.ant@1.0.so"
+    "lib/com.dsi.ant@1.0.so"
+    "lib64/vendor.qti.hardware.systemhelper@1.0.so"
+    "lib/vendor.qti.hardware.systemhelper@1.0.so"
+    "lib64/vendor.qti.hardware.fstman@1.0.so"
 )
 ALL_SKIP_FILES=("${VENDOR_SKIP_FILES_COMMON[@]}" "${VENDOR_SKIP_FILES_DEVICE[@]}")
 
@@ -699,20 +958,10 @@ as_module "lib64/libthermalclient.so"
 as_module "lib/libthermalclient.so"
 as_module "lib64/libfastcvopt.so"
 as_module "lib/libfastcvopt.so"
-as_module "etc/vintf/manifest/android.hardware.atrace@1.0-service.xml"
-as_module "etc/vintf/manifest/android.hardware.biometrics.fingerprint@2.1-service.xml"
 as_module "etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml"
-as_module "etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml"
-as_module "etc/vintf/manifest/android.hardware.health@2.1.xml"
 as_module "etc/vintf/manifest/android.hardware.lights-qti.xml"
 as_module "etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti-hta.xml"
 as_module "etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml"
-as_module "etc/vintf/manifest/android.hardware.sensors@2.0-multihal.xml"
-as_module "etc/vintf/manifest/android.hardware.thermal@2.0-service.qti.xml"
-as_module "etc/vintf/manifest/android.hardware.usb@1.2-service.xml"
 as_module "etc/vintf/manifest/c2_manifest_vendor.xml"
-as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml"
 as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml"
 as_module "etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"