From 5d8bcc3d52a7b8756c47dc2ef2616e409e8e08f8 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 21 Mar 2024 18:20:04 +0800 Subject: [PATCH] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I5f17634c1bce1f5d184b50092a5c419c66e8f449 --- device-tangorpro.mk | 4 +++- tangorpro/BoardConfig.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 5b694ff..1f65d87 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -179,8 +179,10 @@ include device/google/tangorpro/fingerprint_config.mk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk endif diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index ec39627..65b2efb 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -17,8 +17,10 @@ TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := tangorpro ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif