OSDN Git Service

build: Don't call make_recovery_patch if there's no recovery.
authorTao Bao <tbao@google.com>
Wed, 19 Aug 2015 01:03:56 +0000 (18:03 -0700)
committerRom Lemarchand <romlem@google.com>
Mon, 16 Nov 2015 20:02:24 +0000 (12:02 -0800)
Change-Id: I7ae57f6d69293645f88cbe9cc61b7cbbe8d12430
(cherry picked from commit cbc6dc29d6ac0f42db2176177fd2d2ad74923133)

core/Makefile

index 07d1c94..cdf0ffe 100644 (file)
@@ -1516,8 +1516,10 @@ ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
        $(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt
 endif
        $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
+ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
        $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
            ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)
+endif
        @# Zip everything up, preserving symlinks
        $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
        @# Run fs_config on all the system, vendor, boot ramdisk,