Move the check of 16k folder to BoardConfig-common.mk

Bug: 391282888
Flag: EXEMPT bugfix
Change-Id: I8d73365d826bc439b9b2f938afbe54cbcb48e380
This commit is contained in:
Nina Chen 2025-01-22 15:53:42 +08:00
parent 2f0401baf1
commit b000f3b7b5
2 changed files with 2 additions and 4 deletions

View file

@ -14,8 +14,6 @@
# 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
@ -48,5 +46,3 @@ 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

View file

@ -17,7 +17,9 @@ include build/make/target/board/BoardConfigMainlineCommon.mk
include build/make/target/board/BoardConfigPixelCommon.mk
# Include settings for 16k developer option, if enabled
ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
include device/google/zuma/BoardConfig-16k-common.mk
endif
# HACK : To fix up after bring up multimedia devices.
TARGET_SOC := zuma