From 9e1bb10e89eca5f841f4c922d0b3c136e5f6d736 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 2 Aug 2024 09:14:34 +0000
Subject: [PATCH] 16k: Ignore 16k kernel settings if 16kb folder doesn't exist

to avoid build breakage with test kernel prebuilts (e.g. ag/28525733)
that doesn't have 16kb artifacts in it.

Bug: 370842132
Bug: 349877551
Flag: EXEMPT bugfix
Change-Id: I2f6c1f3365f624502366b883dbcd1066ed166cdb
Merged-In: I2f6c1f3365f624502366b883dbcd1066ed166cdb
---
 BoardConfig-16k-common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk
index f7bee9d1..6498e054 100644
--- a/BoardConfig-16k-common.mk
+++ b/BoardConfig-16k-common.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
+
 ifeq ($(TARGET_BOOTS_16K),true)
 # Configures the 16kb kernel directory.
 TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
@@ -36,3 +38,5 @@ BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(
 BOARD_16K_OTA_USE_INCREMENTAL := true
 BOARD_16K_OTA_MOVE_VENDOR := true
 endif
+
+endif