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

This commit is contained in:
KRIS CHEN 2024-06-21 07:16:55 +00:00 committed by Android (Google) Code Review
commit 1416e8fe47

View file

@ -41,7 +41,11 @@ include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/stm/stm11.mk include device/google/gs-common/touch/stm/stm11.mk
# Fingerprint HAL # Fingerprint HAL
ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION)))
GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next
else
GOODIX_CONFIG_BUILD_VERSION := g7_trusty GOODIX_CONFIG_BUILD_VERSION := g7_trusty
endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),) ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)