diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-18 21:22:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-18 21:22:05 +0000 |
| commit | bb0d6a42d8aa792da173f4a7cf074b0c47fb5478 (patch) | |
| tree | cec863cec43c2a2b315392a6f64c9b952027fd11 | |
| parent | f00fbb4ae4ace4ffaad96e206c145281d7fcfd7f (diff) | |
| parent | 1024d6a17fa2badd43c6ed07abfeddd3d08d60f5 (diff) | |
| download | platform_build-bb0d6a42d8aa792da173f4a7cf074b0c47fb5478.tar.gz platform_build-bb0d6a42d8aa792da173f4a7cf074b0c47fb5478.tar.bz2 platform_build-bb0d6a42d8aa792da173f4a7cf074b0c47fb5478.zip | |
Merge "Fix kernel module build of custom image"
| -rw-r--r-- | core/tasks/tools/build_custom_image.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/tasks/tools/build_custom_image.mk b/core/tasks/tools/build_custom_image.mk index 4721591cf3..8b766aefd8 100644 --- a/core/tasks/tools/build_custom_image.mk +++ b/core/tasks/tools/build_custom_image.mk @@ -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))\ |