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

Commit 4b8e319e authored by Saravana Kannan's avatar Saravana Kannan Committed by Automerger Merge Worker
Browse files

Merge "Strip recovery kernel modules by default" am: d6dc4a1d am: d64f3cd2 am: 4a42eda1 

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

Change-Id: Ibfb2b716fdc10d79b7059dab2a995df941e2126c
parents 5d04c6af 4a42eda1

core/Makefile

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

  endif

endif

endif





ifneq ($(BOARD_DO_NOT_STRIP_RECOVERY_MODULES),true)

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

else

	RECOVERY_STRIPPED_MODULE_STAGING_DIR :=

endif



ifneq ($(BOARD_DO_NOT_STRIP_VENDOR_MODULES),true)

ifneq ($(BOARD_DO_NOT_STRIP_VENDOR_MODULES),true)

	VENDOR_STRIPPED_MODULE_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_vendor_stripped)

	VENDOR_STRIPPED_MODULE_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_vendor_stripped)

else

else
@@ -501,7 +507,7 @@ endif 




BOARD_KERNEL_MODULE_DIRS += top

BOARD_KERNEL_MODULE_DIRS += top

$(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \

$(foreach kmd,$(BOARD_KERNEL_MODULE_DIRS), \

  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,RECOVERY,$(TARGET_RECOVERY_ROOT_OUT),,modules.load.recovery,,$(kmd))) \

  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,RECOVERY,$(TARGET_RECOVERY_ROOT_OUT),,modules.load.recovery,$(RECOVERY_STRIPPED_MODULE_STAGING_DIR),$(kmd))) \

  $(eval vendor_ramdisk_fragment := $(KERNEL_MODULE_DIR_VENDOR_RAMDISK_FRAGMENT_$(kmd))) \

  $(eval vendor_ramdisk_fragment := $(KERNEL_MODULE_DIR_VENDOR_RAMDISK_FRAGMENT_$(kmd))) \

  $(if $(vendor_ramdisk_fragment), \

  $(if $(vendor_ramdisk_fragment), \

    $(eval output_dir := $(VENDOR_RAMDISK_FRAGMENT.$(vendor_ramdisk_fragment).STAGING_DIR)) \

    $(eval output_dir := $(VENDOR_RAMDISK_FRAGMENT.$(vendor_ramdisk_fragment).STAGING_DIR)) \