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

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

Merge "Fix typo in cross partition dependency generation" am: 3de79b18 am:... 

Merge "Fix typo in cross partition dependency generation" am: 3de79b18 am: 4e983209 am: 16085dd4

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



Change-Id: Ia5ff59e7789bf0a8b795f094325d42619ba5e34a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 847ba278 16085dd4

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -379,10 +379,10 @@ $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: $(1) $(6) 
	# dependency resolution, we achieve this by maually removing any duplicate

	# modules with lower priority.

	$(if $(9),\

	  find $$(PRIVATE_EXTRA_MODULE_DIR) -maxdepth 1 -type f -name "*.ko" -delete; \

	  mkdir -p $$(PRIVATE_EXTRA_MODULE_DIR); \

	  cp $$(EXTRA_MODULES) $$(PRIVATE_EXTRA_MODULE_DIR); \

	  ln -sf $$(PRIVATE_EXTRA_MODULE_DIR)/*.ko $$(PRIVATE_EXTRA_MODULE_DIR); \

	  find $$(PRIVATE_EXTRA_MODULE_DIR) -maxdepth 1 -type f -name "*.ko" -delete; \

	  cp $$(PRIVATE_EXTRA_MODULES) $$(PRIVATE_EXTRA_MODULE_DIR); \

	  ln -sf $$(PRIVATE_MODULE_DIR)/*.ko $$(PRIVATE_EXTRA_MODULE_DIR); \

	  find $$(PRIVATE_EXTRA_MODULE_DIR) -type l -delete; \

	)

	$(DEPMOD) -b $$(PRIVATE_STAGING_DIR) 0.0