commit aa9f3054a1007338666fe4ca10f1ad4fe73f3040
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 08 19:17:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 08 19:17:50 2022 +0000
tree 27e4b7751072717e1b48ffd6deb95521b8fb43b2
parent 82ad6d35f4b67d0a6fa7f89eca7a3066288b11f6
parent 4d1a91b455e05b8213a15b4b611bab914d419934

Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf am: 4d1a91b455

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

Change-Id: I975fdc387f0eefd898dd0475521c9b43ffdc3e44

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 2841253..8168203 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/