From 5686503666de494069973a9d720494a68309f843 Mon Sep 17 00:00:00 2001
From: eddielan <eddielan@google.com>
Date: Thu, 22 Apr 2021 17:38:31 +0800
Subject: [PATCH] fpc: Refine fpc HIDL & AIDL build mechanism

Bug: 185464439
Test: Build Pass
Change-Id: Id78789186efc1edf7480e61ab9f60b0286df6e45
---
 ...t_config.mk => fingerprint_aidl_config.mk} | 12 ++++-----
 ....mk => fingerprint_hidl_config_factory.mk} |  0
 fingerprint/fpc1540/fpc1540.mk                | 27 ++++++++++++++++---
 fingerprint/fpc1540/fpc1540_factory.mk        | 10 -------
 4 files changed, 30 insertions(+), 19 deletions(-)
 rename fingerprint/fpc1540/{fingerprint_config.mk => fingerprint_aidl_config.mk} (72%)
 rename fingerprint/fpc1540/{fingerprint_config_factory.mk => fingerprint_hidl_config_factory.mk} (100%)
 delete mode 100644 fingerprint/fpc1540/fpc1540_factory.mk

diff --git a/fingerprint/fpc1540/fingerprint_config.mk b/fingerprint/fpc1540/fingerprint_aidl_config.mk
similarity index 72%
rename from fingerprint/fpc1540/fingerprint_config.mk
rename to fingerprint/fpc1540/fingerprint_aidl_config.mk
index 1584e11f..1697ce55 100644
--- a/fingerprint/fpc1540/fingerprint_config.mk
+++ b/fingerprint/fpc1540/fingerprint_aidl_config.mk
@@ -1,18 +1,18 @@
 # ----------------------------
 # Add feature flags below
 # ----------------------------
-FPC_CONFIG_BUILD_VERSION=33
-FPC_CONFIG_CAPACITIVE=1
+FPC_CONFIG_BUILD_VERSION=33_aidl
+FPC_CONFIG_GOOGLE_CUSTOMIZE=1
 FPC_CONFIG_MAX_NR_TEMPLATES=5
+FPC_CONFIG_NAVIGATION=1
 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_HAL_SHARED_LIB=1
 FPC_SENSOR_SDK_LOG_LEVEL=3
 FPC_TEE_RUNTIME=TRUSTY
 LIBFPC_NAME=libfpc1541_S_nav_debug.a
 FPC_CONFIG_DEBUG=1
+FPC_CONFIG_ENGINEERING=1
 FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S
-
-#
-# File included from device/<manufacture>/<>/<device>.mk
-# Packages to include into the build
diff --git a/fingerprint/fpc1540/fingerprint_config_factory.mk b/fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
similarity index 100%
rename from fingerprint/fpc1540/fingerprint_config_factory.mk
rename to fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
diff --git a/fingerprint/fpc1540/fpc1540.mk b/fingerprint/fpc1540/fpc1540.mk
index 7fdcb120..7ed6aa0e 100644
--- a/fingerprint/fpc1540/fpc1540.mk
+++ b/fingerprint/fpc1540/fpc1540.mk
@@ -1,8 +1,29 @@
-# Fingerprint
-include device/google/gs101/fingerprint/fpc1540/fingerprint_config.mk
-
+# Factory build, use HIDL hal & extension so that we can use Test tool
+ifneq ( ,$(filter factory, $(TARGET_PRODUCT)))
+include device/google/gs101/fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.1-service.fpc \
+    fpc_tee_test\
+    SensorTestTool \
+	ImageTool \
+	ImageCollection \
+
+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/fingerprint_aidl_config.mk
+
+PRODUCT_PACKAGES += \
+	android.hardware.biometrics.fingerprint-service.fpc \
+	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/fingerprint/fpc1540/fpc1540_factory.mk b/fingerprint/fpc1540/fpc1540_factory.mk
deleted file mode 100644
index e868c5e9..00000000
--- a/fingerprint/fpc1540/fpc1540_factory.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Fingerprint
-include device/google/gs101/fingerprint/fpc1540/fingerprint_config_factory.mk
-
-PRODUCT_PACKAGES += \
-    fpc_tee_test\
-    SensorTestTool \
-
-PRODUCT_PACKAGES += \
-    com.fingerprints.extension.xml \
-    com.fingerprints.extension \