From b2356df1083de7893e239b0e509abe583353fd5d Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Tue, 24 Oct 2023 11:05:48 +0800
Subject: [PATCH] use AP1% for 24Q1 build

Bug: 299879102
Change-Id: I0f040f9eda38fd40170be64433838b6a063f44ef
---
 device-husky.mk           | 4 ++--
 device-ripcurrent.mk      | 2 +-
 device-shiba.mk           | 4 ++--
 husky/BoardConfig.mk      | 2 +-
 ripcurrent/BoardConfig.mk | 2 +-
 shiba/BoardConfig.mk      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index b2a138b..c74bdaf 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -257,7 +257,7 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
@@ -292,7 +292,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true
 
 # Fingerprint HAL
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
 else
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 6c391c5..6c904c8 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -211,7 +211,7 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
diff --git a/device-shiba.mk b/device-shiba.mk
index 9a99296..4694a72 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -242,7 +242,7 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
@@ -273,7 +273,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true
 
 # Fingerprint HAL
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
 else
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index cb6bb16..11f0b58 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -27,7 +27,7 @@ TARGET_BOOTLOADER_BOARD_NAME := husky
 
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
 RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index e8f5e6e..8f23294 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -27,7 +27,7 @@ TARGET_SCREEN_DENSITY := 440
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_SHUSKY := true
 
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 5e95f4d..fea737f 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -27,7 +27,7 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba
 
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
 RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk