From cc33f170f6e75d8f96d2adf51e3c26888ece0f57 Mon Sep 17 00:00:00 2001
From: Giovanni Ricca <giovanniricca@proton.me>
Date: Tue, 6 Feb 2024 16:13:46 +0100
Subject: [PATCH] rosemary: Build goodix lib from source

Change-Id: Ibaf1b9489b509318032c720c9c83e315cfe6ab3e
---
 Android.bp            |  5 +++--
 biometrics/Android.bp | 11 +++++++++++
 device.mk             |  3 +++
 extract-files.sh      |  4 ----
 proprietary-files.txt |  1 -
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 biometrics/Android.bp

diff --git a/Android.bp b/Android.bp
index 49ff320..065ce20 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6,6 +6,7 @@
 
 soong_namespace {
     imports: [
-        "hardware/google/pixel"
-    ]
+        "hardware/google/pixel",
+        "hardware/xiaomi",
+    ],
 }
diff --git a/biometrics/Android.bp b/biometrics/Android.bp
new file mode 100644
index 0000000..8feef34
--- /dev/null
+++ b/biometrics/Android.bp
@@ -0,0 +1,11 @@
+//
+// Copyright (C) 2023 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library_shared {
+    name: "libvendor.goodix.hardware.biometrics.fingerprint@2.1",
+    shared_libs: ["vendor.goodix.hardware.biometrics.fingerprint@2.1"],
+    vendor_available: true,
+}
diff --git a/device.mk b/device.mk
index 58d9b69..c531dd1 100644
--- a/device.mk
+++ b/device.mk
@@ -161,6 +161,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.3-service.xiaomi
 
+PRODUCT_PACKAGES += \
+    libvendor.goodix.hardware.biometrics.fingerprint@2.1.vendor
+
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
     $(LOCAL_PATH)/configs/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl
diff --git a/extract-files.sh b/extract-files.sh
index 03a57db..32d30e0 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -94,10 +94,6 @@ function blob_fixup {
         vendor/lib*/hw/vendor.mediatek.hardware.pq@2.13-impl.so)
             "${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${2}"
             ;;
-        vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so)
-            "${PATCHELF_0_8}" --remove-needed "libhidlbase.so" "${2}"
-            sed -i "s/libhidltransport.so/libhidlbase-v32.so\x00/" "${2}"
-            ;;
         vendor/lib64/libgf_hal.so)
             sed -i 's/\xff\xc3\x01\xd1\xfd\x7b\x06\xa9/\x00\x00\x80\xd2\xc0\x03\x5f\xd6/g' "${2}"
             ;;
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9b94e83..a164689 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1643,7 +1643,6 @@ vendor/lib64/com.fingerprints.extension@1.0.so
 vendor/lib64/libgf_ca.so
 vendor/lib64/libgf_hal.so
 vendor/lib64/libgoodixhwfingerprint.so
-vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so
 
 # Firmware
 vendor/firmware/BT_FW.cfg