From 4cc703c46b481a8d7981b444825ffb57cde7342e Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Tue, 3 Oct 2023 18:15:17 +0800
Subject: [PATCH] Split bootloader prebuilt to 24Q1 and trunk version

Bug: 299879102
Change-Id: I5a3635de2bdf02d386f9449b815cb450bb53f5b4
---
 device-husky.mk           | 11 ++++++++++-
 device-ripcurrent.mk      |  5 +++++
 device-shiba.mk           | 11 ++++++++++-
 husky/BoardConfig.mk      |  7 ++++++-
 ripcurrent/BoardConfig.mk |  6 ++++++
 shiba/BoardConfig.mk      |  6 +++++-
 6 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index c098901..2601aac 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -253,6 +253,11 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
+endif
 
 # UWB
 PRODUCT_SOONG_NAMESPACES += \
@@ -283,8 +288,12 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true
 
 # Fingerprint HAL
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+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
+endif
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-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)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 6cf6410..9b2123e 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -211,6 +211,11 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
+endif
 
 # UWB
 PRODUCT_SOONG_NAMESPACES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index 55caef5..f856537 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -238,6 +238,11 @@ PRODUCT_PACKAGES += \
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
+endif
 
 # Location
 # SDK build system
@@ -264,8 +269,12 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true
 
 # Fingerprint HAL
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+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
+endif
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-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)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index feae954..cb6bb16 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -27,7 +27,12 @@ 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)
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_HUSKY_BOOTLOADER_DIR)
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
+
 
 ifdef PHONE_CAR_BOARD_PRODUCT
     include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index a84d4b0..e8f5e6e 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -27,6 +27,12 @@ TARGET_SCREEN_DENSITY := 440
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_SHUSKY := true
 
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
+
 include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 3bd73a1..5e95f4d 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -27,7 +27,11 @@ 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)
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_SHIBA_BOOTLOADER_DIR)
+ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
 
 ifdef PHONE_CAR_BOARD_PRODUCT
     include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk