From 8193900f872db276f8d88ca0d8128fde50f1f158 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Sat, 8 Jan 2022 23:46:40 +0800 Subject: [PATCH] Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B))) Else the branch condition would always evaluate to true, making the other branch useless and wrong! Bug: 211741246 Test: m dist Change-Id: I4791712632cbe0d5a9e20962c8425dd20bbe0bfd --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index aaf2ba4c22..ea5fc491c5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5379,7 +5379,7 @@ ifdef BOARD_PREBUILT_INIT_BOOT_IMAGE $(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/