commit 835cadfadc86c3779738e41109ab3b4fd9f045c2
author Cyan Hsieh <cyanhsieh@google.com> Thu Dec 14 08:44:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 14 08:44:11 2023 +0000
tree f7084abfbd104e687b3054cdfd06309c3d60b6e1
parent 14280944257427caad52d53622be41c2d638d720
parent 87b8b4e7570bcfe208ed658d054c89fc9616e113

Merge "Branch bootloader prebuilts for 24Q2 release" into main

device-husky.mk

diff --git a/device-husky.mk b/device-husky.mk
index 9259359..003e33d 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -259,6 +259,8 @@
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
 endif
@@ -294,6 +296,8 @@
 # Fingerprint HAL
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
 else
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
 endif

device-ripcurrent.mk

diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 31f2212..0717be5 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -217,6 +217,8 @@
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
 endif

device-shiba.mk

diff --git a/device-shiba.mk b/device-shiba.mk
index 7cdf790..f7879f6 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -246,6 +246,8 @@
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
 else
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
 endif
@@ -277,6 +279,8 @@
 # Fingerprint HAL
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
 else
 APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
 endif

husky/BoardConfig.mk

diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 11f0b58..0f5e382 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -29,6 +29,8 @@
 RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
 endif

ripcurrent/BoardConfig.mk

diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index 8f23294..d25edd1 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -29,6 +29,8 @@
 
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
 endif

shiba/BoardConfig.mk

diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index fea737f..4ae6c8b 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -29,6 +29,8 @@
 RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
 ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
 endif