From 6141679fa5deb3408877a334a8fc07e63f874640 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Mon, 23 Oct 2023 21:28:29 +0800 Subject: [PATCH] Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: Ieaea8397a0c81c5c6d78613a2a08376b7d71f4db --- device-lynx.mk | 10 ++++++++++ lynx/BoardConfig.mk | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index f4d87f4..cb40007 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -146,6 +146,11 @@ include device/google/lynx/bluetooth/qti_default.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk +endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -167,6 +172,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk +endif # GPS xml ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 732bf94..92ac058 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -18,7 +18,11 @@ TARGET_BOARD_INFO_FILE := device/google/lynx/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := lynx RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_LYNX_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk