Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f
am: 4f8d04b603
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497 Change-Id: I4a164373f540863d6f7062347e9eb90261659202
This commit is contained in:
@@ -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/
|
||||
|
Reference in New Issue
Block a user