diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2015-10-21 23:29:05 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-10-25 07:49:40 -0700 |
| commit | 49834a84fca1488377c2d8cb27c90745d3934148 (patch) | |
| tree | 9845a8fd99b75b783364aa63cbaa86b367e26750 | |
| parent | c3eb1079ea1ee513422cfe16d4c5574a2c1ee7a5 (diff) | |
| download | build-49834a84fca1488377c2d8cb27c90745d3934148.zip build-49834a84fca1488377c2d8cb27c90745d3934148.tar.gz build-49834a84fca1488377c2d8cb27c90745d3934148.tar.bz2 | |
build: Fix check on BOARD_CUSTOM_BOOTIMG_MK
In the current code, '!' is added as prefix to the string contained in
$(BOARD_CUSTOM_BOOTIMG_MK). This means that !$(BOARD_CUSTOM_BOOTIMG_MK)
is never an empty string and therefore the condition is always true.
The if function has a third optional argument that is evalueted when the
condition is false, so use it to fix the current code.
Change-Id: If1e459f6c40f655b47a12b77761921c943964e3b
| -rw-r--r-- | core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index f6748de..835edeb 100644 --- a/core/Makefile +++ b/core/Makefile @@ -961,7 +961,7 @@ define build-recoveryimage-target > $(TARGET_RECOVERY_ROOT_OUT)/default.prop $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk) - $(if !$(BOARD_CUSTOM_BOOTIMG_MK), + $(if $(BOARD_CUSTOM_BOOTIMG_MK),, $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \ $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned, \ $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1) --id > $(RECOVERYIMAGE_ID_FILE)) |