Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca63c494 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "build: core: Add 16kb modules loaded in Second Stage to vendor_dlkm"... 

Merge "build: core: Add 16kb modules loaded in Second Stage to vendor_dlkm" into main am: 5baa58cf

Original change: https://android-review.googlesource.com/c/platform/build/+/3501277



Change-Id: I3dc87c9892635ce74ae5b6d4de1cab9b888bc843
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89f48b49 5baa58cf

core/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -1533,11 +1533,26 @@ boototapackage_4k: $(BUILT_BOOT_OTA_PACKAGE_4K) 
ifeq ($(BOARD_16K_OTA_MOVE_VENDOR),true)

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_4K),$(TARGET_OUT_VENDOR)/boot_otas/boot_ota_4k.zip))

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_16K),$(TARGET_OUT_VENDOR)/boot_otas/boot_ota_16k.zip))



ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_VENDOR)/boot_otas/boot_ota_4k.zip

ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_VENDOR)/boot_otas/boot_ota_16k.zip



ifneq ($(BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE),)

# Add the modules that need to be loaded in the Second Boot Stage

# to /vendor_dlkm/lib/modules/16k-mode

VENDOR_DLKM_16K_MODE_DIR := lib/modules/16k-mode

$(foreach module,$(BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE), \

    $(eval $(call copy-one-file,$(TARGET_KERNEL_DIR_16K)/$(module),\

                                $(TARGET_OUT_VENDOR_DLKM)/$(VENDOR_DLKM_16K_MODE_DIR)/$(module))))



ALL_DEFAULT_INSTALLED_MODULES += $(foreach module,$(BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE),\

    $(TARGET_OUT_VENDOR_DLKM)/$(VENDOR_DLKM_16K_MODE_DIR)/$(module))

endif # BOARD_VENDOR_KERNEL_MODULES_2ND_STAGE_16KB_MODE not empty



else

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_4K),$(TARGET_OUT)/boot_otas/boot_ota_4k.zip))

$(eval $(call copy-one-file,$(BUILT_BOOT_OTA_PACKAGE_16K),$(TARGET_OUT)/boot_otas/boot_ota_16k.zip))



ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_4k.zip

ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT)/boot_otas/boot_ota_16k.zip

endif # BOARD_16K_OTA_MOVE_VENDOR == true