Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8193900f authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Yi-yo Chiang
Browse files

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
parent 555c3a7d

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/