From fa39f73b76ec062dae002a7e5b62917b3af93705 Mon Sep 17 00:00:00 2001
From: chenkris <chenkris@google.com>
Date: Mon, 24 Jun 2024 11:19:21 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"Build=20g7=5Ftrusty=5Fnext=20for=20?=
 =?UTF-8?q?=E2=80=9Cnext=E2=80=9D=20configuration"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0e1f7f452bf2cd28b3e155c18681495f6d5b4e63.

Bug: 348542941
Test: build
Change-Id: I2cb5e93529eac7831a6010b0ce83d56e8bec23fc
---
 device-bluejay.mk | 4 ----
 1 file changed, 4 deletions(-)

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