Revert "Build g7_trusty_next for “next” configuration"

This reverts commit 0e1f7f452b.

Bug: 348542941
Test: build
Change-Id: I2cb5e93529eac7831a6010b0ce83d56e8bec23fc
This commit is contained in:
chenkris 2024-06-24 11:19:21 +00:00
parent 1416e8fe47
commit fa39f73b76

View file

@ -41,11 +41,7 @@ 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)