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

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

Merge "Fix kernel module build of custom image" am: bb0d6a42 am: 11d1759b 

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

Change-Id: Ibf88352725e43a3ea92f03aa739624c25a669310
parents fdae0054 11d1759b

core/tasks/tools/build_custom_image.mk

+3 −2
Original line number Diff line number Diff line
@@ -57,12 +57,13 @@ $(foreach m,$(CUSTOM_IMAGE_MODULES),\ 
my_kernel_module_copy_files :=

my_custom_image_modules_var := BOARD_$(strip $(call to-upper,$(my_custom_image_name)))_KERNEL_MODULES

ifdef $(my_custom_image_modules_var)

  my_kernel_module_copy_files += $(call build-image-kernel-modules,$(my_custom_image_modules_var),$(my_staging_dir),$(my_custom_image_name)/,$(call intermediates-dir-for,PACKAGING,depmod_$(my_custom_image_name)))

  my_kernel_module_copy_files += $(call build-image-kernel-modules,$($(my_custom_image_modules_var)),$(my_staging_dir),$(CUSTOM_IMAGE_MOUNT_POINT),$(call intermediates-dir-for,PACKAGING,depmod_$(my_custom_image_name)),$($(my_custom_image_modules_var)),modules.load,,$(call intermediates-dir-for,PACKAGING,depmod_$(my_custom_image_name)_stripped))

  my_copy_pairs += $(my_kernel_module_copy_files)

endif



# Collect CUSTOM_IMAGE_COPY_FILES.

my_image_copy_files :=

$(foreach f,$(CUSTOM_IMAGE_COPY_FILES) $(my_kernel_module_copy_files),\

$(foreach f,$(CUSTOM_IMAGE_COPY_FILES),\

  $(eval pair := $(subst :,$(space),$(f)))\

  $(eval src := $(word 1,$(pair)))\

  $(eval my_image_copy_files += $(src))\