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

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

Merge "Quote pattern in 'find' command used to generate modules.load" am: 530db0e7 

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



Change-Id: I4e9dc97067a41803c3c9a2b21917600f21b1b353
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f1c3fe8 530db0e7

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: $(1) $(6) 
	  unzip -qoDD -d $$(PRIVATE_MODULE_DIR) $$(PRIVATE_MODULE_ARCHIVE); \

	  mkdir -p $$(PRIVATE_OUTPUT_DIR)/lib; \

	  cp -r  $(3)/$(DEPMOD_STAGING_SUBDIR)/$(2)/lib/modules $$(PRIVATE_OUTPUT_DIR)/lib/; \

	  find $$(PRIVATE_MODULE_DIR) -type f -name *.ko | xargs basename -a > $$(PRIVATE_LOAD_FILE); \

	  find $$(PRIVATE_MODULE_DIR) -type f -name '*.ko' | xargs basename -a > $$(PRIVATE_LOAD_FILE); \

	)

	$(if $(1),\

	  cp $$(PRIVATE_MODULES) $$(PRIVATE_MODULE_DIR)/; \