commit 6a95477b0f13667f65bd5260337f281005660c82
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 08 18:20:12 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 08 18:20:12 2022 +0000
tree 3d42477b9b00fc21439179209099243a0512184a
parent 555c3a7dc7ca3d35103e796d6b8e61112f720745
parent 8193900f872db276f8d88ca0d8128fde50f1f158

Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index aaf2ba4..ea5fc49 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5379,7 +5379,7 @@
 	$(hide) cp $(INSTALLED_INIT_BOOT_IMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
 endif
 ifndef BOARD_PREBUILT_BOOTIMAGE
-ifneq (,$(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES)))
+ifneq (,$(strip $(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES))))
 ifdef INSTALLED_BOOTIMAGE_TARGET
 	$(hide) mkdir -p $(zip_root)/IMAGES
 	$(hide) cp $(INSTALLED_BOOTIMAGE_TARGET) $(zip_root)/IMAGES/