From 5e5af5c774fac7f1c5ad7b383979d7f1159190da Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Fri, 19 May 2023 15:31:43 +0900
Subject: [PATCH] Install Fingerprint HAL APEX

Fingerprint HAL APEX packages the HAL binary along with its Trusty APP
(g7.app). Permission file is also bundled in the apex, so we don't need
to copy it separately.

For now, the FP APEX is only used when its Trusty App is specified.

Bug: 279674662
Test: fingerprint works.
Change-Id: Ia8483cc699cadf28eb258087dcda3e89ca8127ca
---
 fingerprint/udfps_shipping.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fingerprint/udfps_shipping.mk b/fingerprint/udfps_shipping.mk
index c8203b18..0951c010 100644
--- a/fingerprint/udfps_shipping.mk
+++ b/fingerprint/udfps_shipping.mk
@@ -14,8 +14,12 @@
 # limitations under the License.
 #
 
+ifneq (,$(call soong_config_get,goodix,fingerprint_ta))
+PRODUCT_PACKAGES += com.google.android.hardware.biometrics.fingerprint
+else
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint-service.goodix
+endif
\ No newline at end of file