From 68f0c9e874521d286c9a1d00f3bf37077a290206 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Sat, 2 Nov 2024 23:12:42 +0100
Subject: [PATCH] fixup! e3q: Initial commit

---
 device.mk        | 5 +++++
 extract-files.sh | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 1a1e809..8ec5b89 100644
--- a/device.mk
+++ b/device.mk
@@ -35,9 +35,14 @@ PRODUCT_PACKAGES += \
     android.hardware.fastboot@1.1-impl-mock \
     fastbootd
 
+# Keymaster
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@4.1.vendor
+
 # Keymint
 PRODUCT_PACKAGES += \
     android.hardware.hardware_keystore.xml \
+    android.hardware.security.sharedsecret-V1-ndk.vendor \
     android.hardware.security.sharedsecret-V2-ndk.vendor \
     android.hardware.weaver-V2-ndk.vendor
 
diff --git a/extract-files.sh b/extract-files.sh
index a1e7438..b354579 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -64,12 +64,16 @@ fi
 
 function blob_fixup() {
     case "${1}" in
-	vendor/bin/hw/android.hardware.security.keymint-service|vendor/lib64/libskeymint10device.so|vendor/lib64/libskeymint_cli.so)
+        vendor/lib64/libhyper.so|vendor/lib64/libspukeymintdeviceutils.so|vendor/lib64/hw/gatekeeper.mdfpp.so|vendor/lib64/libcppcose_rkp.so|vendor/lib64/libspukeymint.so|vendor/lib64/libhermes.so|vendor/lib64/libese-grdg.so|vendor/lib64/libspukeymintutils.so|vendor/lib64/libskeymint10device.so|vendor/lib64/liblbs_core.so|vendor/lib64/liboemcrypto.so|vendor/lib64/libwifi-hal-qcom.so|vendor/lib64/libpuresoftkeymasterdevice.so|vendor/lib64/libpal_net_if.so|vendor/lib64/libsfp_sensor.so|vendor/lib64/libkeystore-engine-wifi-hidl.so|vendor/lib64/libkeymaster_portable.so|vendor/lib64/mediacas/libclearkeycasplugin.so|vendor/lib64/libqcc_sdk.so|vendor/lib64/libdk_vnd_service_core.so|vendor/lib64/libwifi-hal.so|vendor/lib64/libtlpd_crypto.so|vendor/lib64/libsec-ril.so|vendor/lib64/libcppbor_external.so|vendor/lib64/libucm_tlc_tz_esecomm.so|vendor/lib64/libqms.so|vendor/lib64/libskeymint_cli.so|vendor/lib64/libengmode15.so|vendor/lib64/libkeymaster4_1support.so|vendor/lib64/libizat_core.so|vendor/lib64/libspcom.so|vendor/lib64/libFaceService.so|vendor/lib64/uwb_uci.hal.so|vendor/lib64/libnicm_utils.so|vendor/lib64/mediadrm/libdrmclearkeyplugin.so|vendor/lib64/libkeymaster4support.so|vendor/lib64/libsdmextension.so)
             [ "$2" = "" ] && return 0
             grep -q "android.hardware.security.rkp-V3-ndk.so" "${2}" || ${PATCHELF} --add-needed "android.hardware.security.rkp-V3-ndk.so" "${2}"
             ${PATCHELF} --replace-needed libcrypto.so libcrypto-v33.so "${2}"
             #${PATCHELF} --replace-needed libcppbor_external.so libcppbor.so "${2}"
             ;;
+        vendor/lib64/hw/gatekeeper.mdfpp.so)
+            [ "$2" = "" ] && return 0
+            ${PATCHELF} --replace-needed libcrypto.so libcrypto-v33.so "${2}"
+            ;;
         *)
             return 1
             ;;