From 0385e708a6ec494e67228834365cc74ae3e9940b Mon Sep 17 00:00:00 2001 From: leohsieh Date: Thu, 19 Aug 2021 23:56:06 +0800 Subject: [PATCH] Remove project info from udfps_common.mk Move GOODIX_CONFIG_BUILD_VERSION to device mk. Fixes "There is no fp HAL on factory build". Bug: 197213960 Test: lunch oriole-userdebug Test: lunch factory_oriole-userdebug Test: lunch oriole_hwasan-userdebug Change-Id: I39ba0675eb3046d7d8229a996f3d728aedc59b02 --- fingerprint/udfps_common.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fingerprint/udfps_common.mk b/fingerprint/udfps_common.mk index 51ce07f5..c05097ba 100644 --- a/fingerprint/udfps_common.mk +++ b/fingerprint/udfps_common.mk @@ -24,8 +24,16 @@ DEVICE_MANIFEST_FILE += \ endif # Include the Goodix AIDL HAL namespaces. +ifeq ($(GOODIX_CONFIG_BUILD_VERSION), g6_trusty) PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty +else ifeq ($(GOODIX_CONFIG_BUILD_VERSION), g7_trusty) +# TODO(b/196017212): support AIDL for g7 and remove the following package. +PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint@2.1-service.goodix +else +$(error Invalid udfps build version) +endif SOONG_CONFIG_NAMESPACES += fp_hal_feature SOONG_CONFIG_fp_hal_feature += biometric_suez_support