diff options
| author | Bart Van Assche <bvanassche@google.com> | 2024-02-29 23:51:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 23:51:47 +0000 |
| commit | 3bd214ae73eeaa65f4a240f1f00154071e6c68b2 (patch) | |
| tree | af6a9140e27a079039a0f0c0f5abfbe10aa3ba57 | |
| parent | 47b50017df769a8c71fd78ffc56b0d6bed8f08a7 (diff) | |
| parent | a290c6caf8798bc4c1133093da1d797f668b7ec2 (diff) | |
| download | build-3bd214ae73eeaa65f4a240f1f00154071e6c68b2.tar.gz | |
Merge "Makefile: Optimize the code for creating the kernel module list" into main am: a290c6caf8
Original change: https://android-review.googlesource.com/c/platform/build/+/2983201
Change-Id: Ib4809180c24ae9cdc3f5922de7eb48a78a27d0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 10d4df8026..084a500c1b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -465,9 +465,7 @@ $(3)/$(DEPMOD_STAGING_SUBDIR)/modules.dep: $(1) $(6) ) $(if $(1),\ cp $$(PRIVATE_MODULES) $$(PRIVATE_MODULE_DIR)/; \ - for MODULE in $$(PRIVATE_LOAD_MODULES); do \ - basename $$$$MODULE >> $$(PRIVATE_LOAD_FILE); \ - done; \ + if [ -n "$$(PRIVATE_LOAD_MODULES)" ]; then basename -a $$(PRIVATE_LOAD_MODULES); fi > $$(PRIVATE_LOAD_FILE); \ ) # The ln -sf + find -delete sequence is to remove any modules in # PRIVATE_EXTRA_MODULES which have same basename as MODULES in PRIVATE_MODULES |