16k: Move BoardConfig-shusky-common.mk to device/google/zuma/BoardConfig-16k-common.mk
The makefile logic in this file is identical to the logic required for
akita-trunk_staging-userdebug. Hence, this logic is moved to
device/google/zuma/BoardConfig-16k-common.mk to avoid duplicating the
file for akita.
Bug: 370842132
Bug: 349877551
Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets
Flag: EXEMPT bugfix
Change-Id: I80cb3e9f4c4a1609ca668af554d930edb3b4c5a0
Merged-In: I80cb3e9f4c4a1609ca668af554d930edb3b4c5a0
diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk
deleted file mode 100644
index 90ceb83..0000000
--- a/BoardConfig-shusky-common.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2024 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifeq ($(TARGET_BOOTS_16K),true)
-# Configures the 16kb kernel directory.
-TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
-
-else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
-# Configures the 16kb kernel and modules for OTA updates.
-TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
-BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
-
-BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load)
-BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load)
-BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load)
-BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module)))
-
-# Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko.
-BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
-
-BOARD_16K_OTA_USE_INCREMENTAL := true
-BOARD_16K_OTA_MOVE_VENDOR := true
-endif
\ No newline at end of file
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 31915d2..f387ff9 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -47,7 +47,6 @@
WIFI_FEATURE_REAR_CAMERA_SAR := true
$(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR))
-include device/google/shusky/BoardConfig-shusky-common.mk
include device/google/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-common.mk
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 2368ec1..8a5fb4b 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -43,7 +43,6 @@
BOARD_KERNEL_CMDLINE += swiotlb=noforce
BOARD_KERNEL_CMDLINE += disable_dma32=on
-include device/google/shusky/BoardConfig-shusky-common.mk
include device/google/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-common.mk
