From d9aefec54a8e07a4a988caefcf4f82833f1ad400 Mon Sep 17 00:00:00 2001
From: Alec Foster <ajfoster@google.com>
Date: Tue, 26 Mar 2024 23:11:41 +0000
Subject: [PATCH] Only include QfpCalibration on userdebug / eng builds

Bug: 331464683
Test: Ensure QfpCalibration is on userdebug / eng
 biulds and not on user builds.
Change-Id: I815b9999e0e74ac5c1dedf51951de21f992630f6
---
 fingerprint/ultrasonic_udfps.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index df84688a..1e9d8a3f 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -17,12 +17,10 @@
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/qcom/fingerprint/qfp-service \
 	vendor/qcom/fingerprint/QFingerprintService \
-	vendor/qcom/fingerprint/QFPCalibration \
 
 PRODUCT_PACKAGES += \
 	qfp-daemon \
-	QFingerprintService \
-	QFPCalibration \
+	QFingerprintService
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
@@ -36,6 +34,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.qfp.enable_setprop=0 \
 	log.tag.QFP=3
 
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_SOONG_NAMESPACES += \
+	vendor/qcom/fingerprint/QFPCalibration
+endif
+
 ifneq (,$(findstring factory, $(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += QfsFactoryTest
 endif