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

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

Merge "makefile:strip generic ramdisk kernel modules in android build system."... 

Merge "makefile:strip generic ramdisk kernel modules in android build system." into main am: 02eadb87

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



Change-Id: Ie6a276775c28c787705cb23417bf3536d5a63da4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8404655f 02eadb87

core/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -657,6 +657,12 @@ ifneq ($(strip $(BOARD_GENERIC_RAMDISK_KERNEL_MODULES)),) 
  endif

endif



ifneq ($(BOARD_DO_NOT_STRIP_GENERIC_RAMDISK_MODULES),true)

  GENERIC_RAMDISK_STRIPPED_MODULE_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_generic_ramdisk_kernel_stripped)

else

  GENERIC_RAMDISK_STRIPPED_MODULE_STAGING_DIR :=

endif



ifneq ($(BOARD_DO_NOT_STRIP_RECOVERY_MODULES),true)

	RECOVERY_STRIPPED_MODULE_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_recovery_stripped)

else
@@ -711,7 +717,7 @@ $(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \ 
  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,SYSTEM,$(if $(filter true,$(BOARD_USES_SYSTEM_DLKMIMAGE)),$(TARGET_OUT_SYSTEM_DLKM),$(TARGET_OUT_SYSTEM)),system,modules.load,,$(kmd))) \

  $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

    $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-recovery-as-boot-load,$(kmd))),\

    $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,GENERIC_RAMDISK,$(TARGET_RAMDISK_OUT),,modules.load,,$(kmd)))))

    $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,GENERIC_RAMDISK,$(TARGET_RAMDISK_OUT),,modules.load,$(GENERIC_RAMDISK_STRIPPED_MODULE_STAGING_DIR),$(kmd)))))



ifeq ($(BOARD_SYSTEM_KERNEL_MODULES),)

ifneq ($(BOARD_SYSTEM_DLKM_SRC),)