Revert "DO NOT MERGE Remove unintended face config am: 875235afbf" am: e973ddc480
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18819342
Change-Id: I193bd92568e2da008e04240b1039b34b27f1aa84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 863fc2a..3c24f9a 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -25,7 +25,7 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>com.fingerprints35.extension</name>
+ <name>com.fingerprints42.extension</name>
<version>1.0</version>
<interface>
<name>IFingerprintAuthenticator</name>
diff --git a/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
new file mode 100644
index 0000000..fe8cf8b
--- /dev/null
+++ b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
@@ -0,0 +1,28 @@
+# ----------------------------
+# Add feature flags below
+# ----------------------------
+FPC_CONFIG_BUILD_VERSION=42
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
+FPC_CONFIG_HAL_SHARED_LIB=1
+FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_NO_TU=0
+FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
+FPC_CONFIG_SENSORTEST=1
+FPC_CONFIG_TA_FS=1
+FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
+FPC_OTP_DECODE_ERRORS_IGNORE=1
+FPC_SENSOR_SDK_LOG_LEVEL=3
+FPC_TEE_RUNTIME=TRUSTY
+LIBFPC_NAME=libfpcmulti_debug.a
+FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
+FPC_CONFIG_GOOGLE_RELEASE=1
+FPC_CONFIG_TRUSTY_CLEAN_TA=1
+
+GOOGLE_CONFIG_PERFORMANCE=1
+
+# Enable Suez
+$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
+
+# Must add below method to each project's device.mk to show sensorLocation
+#$(call soong_config_set,fp_hal_feature,pixel_product, project_XX)
diff --git a/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk b/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
new file mode 100644
index 0000000..4b2567d
--- /dev/null
+++ b/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
@@ -0,0 +1,18 @@
+# ----------------------------
+# Add feature flags below
+# ----------------------------
+FPC_CONFIG_BUILD_VERSION=42
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
+FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_NO_TU=0
+FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
+FPC_CONFIG_SENSORTEST=1
+FPC_CONFIG_TA_FS=1
+FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
+FPC_OTP_DECODE_ERRORS_IGNORE=1
+FPC_SENSOR_SDK_LOG_LEVEL=3
+FPC_TEE_RUNTIME=TRUSTY
+LIBFPC_NAME=libfpcmulti_debug.a
+FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
+
diff --git a/fingerprint/fpc1540/sw42/fpc1540.mk b/fingerprint/fpc1540/sw42/fpc1540.mk
new file mode 100644
index 0000000..7770538
--- /dev/null
+++ b/fingerprint/fpc1540/sw42/fpc1540.mk
@@ -0,0 +1,30 @@
+# Factory build, use HIDL hal & extension so that we can use Test tool
+ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
+include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk
+PRODUCT_PACKAGES += \
+ android.hardware.biometrics.fingerprint@2.1-service.fpc \
+ fpc_tee_test\
+ SensorTestTool \
+ ImageTool \
+ ImageCollection \
+ fp_test \
+
+PRODUCT_PACKAGES += \
+ com.fingerprints.extension.xml \
+ com.fingerprints.extension \
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+else
+# Non facotry build, use fingerprint AIDL version
+include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk
+
+PRODUCT_PACKAGES += \
+ android.hardware.biometrics.fingerprint-service.fpc42 \
+ fingerprint.fpc \
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+endif
diff --git a/manifest_64.xml b/manifest_64.xml
index 09466c9..2190686 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -44,15 +44,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.renderscript</name>
- <transport arch="32+64">passthrough</transport>
- <version>1.0</version>
- <interface>
- <name>IDevice</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format = "hidl">
<name>android.hardware.dumpstate</name>
<transport>hwbinder</transport>
