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