diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index d7b74fc..316be50 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -116,6 +116,8 @@ include device/google/tangorpro/bluetooth/syna_default.mk
 # Fingerprint
 include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
 FPC_MODULE_TYPE=1542_S
+# Fingerprint config
+include device/google/tangorpro/fingerprint_config.mk
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
diff --git a/fingerprint_config.mk b/fingerprint_config.mk
new file mode 100644
index 0000000..fd21645
--- /dev/null
+++ b/fingerprint_config.mk
@@ -0,0 +1,7 @@
+# Factory build, use HIDL hal & extension so that we can use Test tool
+ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
+GOOGLE_CONFIG_FP_STATUS=1
+FPC_CONFIG_TRUSTY_CLEAN_TA=1
+else
+# Non factory build, use fingerprint AIDL version
+endif