From 1d8c328f4b3244f513e826b3cb32bace266846e6 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Tue, 30 Apr 2024 13:42:45 +0000
Subject: [PATCH 1/2] Switch kernel directory to control by build flag

Bug: 337161745
Change-Id: I48c8a9863ea57591ab5ce9dfc294a5274567d46c
Merged-In: I6d8e981b2756964dd7b1df38de13fc6a0ae04428
---
 device-comet.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/device-comet.mk b/device-comet.mk
index 6a7be7a..7c4c89a 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,8 +14,14 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/comet-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/comet-kernel/kernel-headers
+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
+else
+TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers
+endif
+
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

From 2a77c3f5de1f5545f9c000ded84284a6bb04f4c6 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 May 2024 04:12:56 +0000
Subject: [PATCH 2/2] 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