From de157ab813ff19cf478a0117cfe11b808e19af21 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Mon, 23 Oct 2023 14:37:10 +0800 Subject: [PATCH] Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: I17599698ca55d738e935b914bbfe55641650f9e1 --- device-tangorpro.mk | 5 +++++ tangorpro/BoardConfig.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index ae62f59..b6aa43c 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -162,6 +162,11 @@ include device/google/tangorpro/fingerprint_config.mk # Trusty liboemcrypto.so 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 +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk +endif # Wifi SAP Interface Name PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index a38dff3..7998f22 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -15,6 +15,11 @@ # 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 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true