Merge "Build g7_trusty_next for “next” configuration" into main

This commit is contained in:
KRIS CHEN 2024-06-21 07:16:54 +00:00 committed by Android (Google) Code Review
commit fa4b16ffb9
2 changed files with 8 additions and 0 deletions

View file

@ -322,7 +322,11 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL
ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION)))
GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next
else
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
endif
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)

View file

@ -305,7 +305,11 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL
ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION)))
GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next
else
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
endif
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)