commit e98d76c98e5cdb01885f2a47586cf414497065bf
author Ilya Matyukhin <ilyamaty@google.com> Thu Apr 01 14:13:19 2021 -0700
committer Ilya Matyukhin <ilyamaty@google.com> Fri Apr 02 00:22:00 2021 +0000
tree 1bac8402bccee04ba724c4ece8a3b11e40e507d1
parent b360446e821a663d4275d8a4eb3d31f276c2e384

Enable both AIDL and HIDL UDFPS HALs

Bug: 175070939
Bug: 183054007
Test: Both binaries are installed on device
Change-Id: I8d791ba117c472a3388f301d78d088dc96eb4255

fingerprint/udfps.mk

diff --git a/fingerprint/udfps.mk b/fingerprint/udfps.mk
index 9d6ea9f..8272527 100644
--- a/fingerprint/udfps.mk
+++ b/fingerprint/udfps.mk
@@ -17,8 +17,10 @@
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
-# Include the Goodix AIDL HAL namespace.
+# Include the Goodix AIDL HAL namespaces.
 PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty
+PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty
 
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.goodix
+    android.hardware.biometrics.fingerprint@2.1-service.goodix \
+    android.hardware.biometrics.fingerprint-service.goodix