From 6572bee96bdb4cc5961428a0284d50abc9e4400e Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Fri, 19 May 2023 20:03:19 +0000
Subject: [PATCH] Revert "16k: Add 16K variant kernel/ramdisk build targets"

This reverts commit 1f04dfaba2f4a1d96801b3b6a6275c510d9efcc6.

Reason for revert: breaks build on ab/10170403

Change-Id: I92e064ab07b02e4f17a22b113032eaa4d9f131cc
---
 core/Makefile | 36 ------------------------------------
 core/main.mk  |  2 --
 2 files changed, 38 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 987721f357..14adbb585c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1001,42 +1001,6 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK)))
 
 BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
 
-
-ifneq ($(BOARD_KERNEL_MODULES_16K),)
-
-TARGET_OUT_RAMDISK_16K := $(PRODUCT_OUT)/ramdisk_16k
-BUILT_RAMDISK_16K_TARGET := $(PRODUCT_OUT)/ramdisk_16k.img
-RAMDISK_16K_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_ramdisk_16k)
-
-$(BUILT_RAMDISK_16K_TARGET): $(DEPMOD)
-$(BUILT_RAMDISK_16K_TARGET): $(call copy-many-files,$(foreach file,$(BOARD_KERNEL_MODULES_16K),$(file):$(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0/$(notdir $(file))))
-	$(DEPMOD) -b $(RAMDISK_16K_STAGING_DIR) 0.0
-	for MODULE in $(BOARD_KERNEL_MODULES_16K); do \
-		basename $$MODULE >> $(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0/modules.load ; \
-	done;
-	mkdir -p $(TARGET_OUT_RAMDISK_16K)/lib
-	rm -rf $(TARGET_OUT_RAMDISK_16K)/lib/modules
-	cp -r $(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0 $(TARGET_OUT_RAMDISK_16K)/lib/modules
-	$(MKBOOTFS) $(TARGET_OUT_RAMDISK_16K) > $@
-
-# Builds a ramdisk using modules defined in BOARD_KERNEL_MODULES_16K
-ramdisk_16k: $(BUILT_RAMDISK_16K_TARGET)
-.PHONY: ramdisk_16k
-
-endif
-
-ifneq ($(BOARD_KERNEL_PATH_16K),)
-BUILT_KERNEL_16K_TARGET := $(PRODUCT_OUT)/kernel_16k
-
-$(eval $(call copy-one-file,$(BOARD_KERNEL_PATH_16K),$(BUILT_KERNEL_16K_TARGET)))
-
-# Copies BOARD_KERNEL_PATH_16K to output directory as is
-kernel_16k: $(BUILT_KERNEL_16K_TARGET)
-.PHONY: kernel_16k
-
-endif
-
-
 ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
 # -l enables the legacy format used by the Linux kernel
 COMPRESSION_COMMAND_DEPS := $(LZ4)
diff --git a/core/main.mk b/core/main.mk
index 0c1fe45a6f..6a24bd3050 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1810,8 +1810,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE))
     $(INTERNAL_OTA_PACKAGE_TARGET) \
     $(INTERNAL_OTA_METADATA) \
     $(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET) \
-    $(BUILT_RAMDISK_16K_TARGET) \
-    $(BUILT_KERNEL_16K_TARGET) \
     $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET) \
     $(SYMBOLS_ZIP) \
     $(SYMBOLS_MAPPING) \