[automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 -s ours am: 377f88a664 -s ours
am skip reason: Merged-In I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f with SHA-1 fd7e6517d3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23305031
Change-Id: I8fa44447ec1f57422b76136a218c1e3d9e7c02cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/Makefile b/core/Makefile
index 6ff7031..ccfa3f2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1001,42 +1001,6 @@
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 a747967..cb4dca6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1810,8 +1810,6 @@
$(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) \