From e765ab049dff6dcda28e57e9caf6fc8058f8d591 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 14:09:47 +0800 Subject: [PATCH] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: I72349a14a2fa1766ca6c2de28b2ec376ab59f99a --- bluejay/BoardConfig.mk | 2 ++ device-bluejay.mk | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 09f98be..714c9c3 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -23,6 +23,8 @@ endif RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_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 diff --git a/device-bluejay.mk b/device-bluejay.mk index fbc90c0..da89a1e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -42,6 +42,8 @@ include device/google/gs-common/touch/stm/stm11.mk GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk endif @@ -144,6 +146,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk endif