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

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

Change-Id: I81655d0dc7410e2e0ecc44bdb7ad7f353f475b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-12-07 04:26:47 +00:00 committed by Automerger Merge Worker
commit 4e983209c7

View file

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