From 2a77c3f5de1f5545f9c000ded84284a6bb04f4c6 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 May 2024 04:12:56 +0000 Subject: [PATCH] Switch bootloader and radio directory to control by build flag Bug: 337163126 Change-Id: Ic9d96526d1c80db35de856d76f2012b3a96da68f Merged-In: I6d8e981b2756964dd7b1df38de13fc6a0ae04428 --- device-comet.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index 7c4c89a..701f884 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -14,6 +14,17 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_COMET_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_COMET_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR) +$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) + + ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers