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

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

Merge "Add missing custom kernel module targets" am: d5b993ba am: cefd2a4a... 

Merge "Add missing custom kernel module targets" am: d5b993ba am: cefd2a4a am: adaf4338 am: 2d6653bf

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

Change-Id: I7fc729ae19232d1bd614b152c3724b06fda7e0e9
parents 38a1ac1f 2d6653bf

core/tasks/tools/build_custom_image.mk

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

my_kernel_module_copy_files :=

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

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

ifdef $(my_custom_image_modules_var)

ifdef $(my_custom_image_modules_var)

  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))

$(foreach kmod,\

  my_copy_pairs += $(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)),\

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

  $(eval my_kernel_module_copy_files += $(word 1,$(pair)):$(subst $(my_staging_dir)/,,$(word 2,$(pair)))))

endif

endif





# Collect CUSTOM_IMAGE_COPY_FILES.

# Collect CUSTOM_IMAGE_COPY_FILES.

my_image_copy_files :=

my_image_copy_files :=

$(foreach f,$(CUSTOM_IMAGE_COPY_FILES),\

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

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

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

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

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

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

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