Merge "Initial Bootloader prebuilt for AP3% build" into main

This commit is contained in:
Treehugger Robot 2024-02-29 17:52:00 +00:00 committed by Android (Google) Code Review
commit 2c9cacfb28
2 changed files with 2 additions and 2 deletions

View file

@ -173,7 +173,7 @@ include device/google/tangorpro/fingerprint_config.mk
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk

View file

@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := tangorpro TARGET_BOOTLOADER_BOARD_NAME := tangorpro
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk