Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fpc: Refine fpc HIDL & AIDL build mechanism am: 014b0d24b0 am: 8bea1934c9

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/14671622

Change-Id: I37b3a4ee6b514b0939a236b7384a5e39d43df1f6
This commit is contained in:
eddielan 2021-05-21 11:06:52 +00:00 • committed by Automerger Merge Worker
commit e1e1d73383
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fingerprint/fpc1540/fingerprint_config.mk → fingerprint/fpc1540/fingerprint_aidl_config.mk
View file

@ -1,18 +1,18 @@
# ---------------------------- # ----------------------------
# Add feature flags below # Add feature flags below
# ---------------------------- # ----------------------------
FPC_CONFIG_BUILD_VERSION=33 FPC_CONFIG_BUILD_VERSION=33_aidl
FPC_CONFIG_CAPACITIVE=1 FPC_CONFIG_GOOGLE_CUSTOMIZE=1
FPC_CONFIG_MAX_NR_TEMPLATES=5 FPC_CONFIG_MAX_NR_TEMPLATES=5
FPC_CONFIG_NAVIGATION=1
FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat
FPC_CONFIG_SENSORTEST=1
FPC_CONFIG_TA_FS=1 FPC_CONFIG_TA_FS=1
FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000 FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000
FPC_HAL_SHARED_LIB=1
FPC_SENSOR_SDK_LOG_LEVEL=3 FPC_SENSOR_SDK_LOG_LEVEL=3
FPC_TEE_RUNTIME=TRUSTY FPC_TEE_RUNTIME=TRUSTY
LIBFPC_NAME=libfpc1541_S_nav_debug.a LIBFPC_NAME=libfpc1541_S_nav_debug.a
FPC_CONFIG_DEBUG=1 FPC_CONFIG_DEBUG=1
FPC_CONFIG_ENGINEERING=1
FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S FPC_CONFIG_PRODUCT_DEFAULT=FPC_PRODUCT_TYPE1541_S
#
# File included from device/<manufacture>/<>/<device>.mk
# Packages to include into the build

0
fingerprint/fpc1540/fingerprint_config_factory.mk → fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
View file

27
fingerprint/fpc1540/fpc1540.mk
View file

@ -1,8 +1,29 @@
# Fingerprint # Factory build, use HIDL hal & extension so that we can use Test tool
include device/google/gs101/fingerprint/fpc1540/fingerprint_config.mk ifneq ( ,$(filter factory, $(TARGET_PRODUCT)))
include device/google/gs101/fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.fpc \ 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 += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml 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

10
fingerprint/fpc1540/fpc1540_factory.mk
View file

@ -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 \