diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-10-23 20:15:03 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-27 00:45:16 +0200 |
| commit | 158f45cdcd180d0a6e266845a4f5cf7ee13ad0ea (patch) | |
| tree | f7bb9f024c2349ec5c33eb17472ead978ba1d37c /core/Makefile | |
| parent | 0da522f2deb366b44f313054776172faf3d405d8 (diff) | |
| download | build-158f45cdcd180d0a6e266845a4f5cf7ee13ad0ea.zip build-158f45cdcd180d0a6e266845a4f5cf7ee13ad0ea.tar.gz build-158f45cdcd180d0a6e266845a4f5cf7ee13ad0ea.tar.bz2 | |
Fix TARGET_RELEASETOOL_MAKE_RECOVERY_PATCH_SCRIPT mismerge
Change-Id: I33164a44a40ef3b925c728d89d7d72aae3da2060
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 449161d..bcb226e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1760,8 +1760,8 @@ ifeq ($(TARGET_RELEASETOOL_MAKE_RECOVERY_PATCH_SCRIPT),) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root) else - $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ - $(hide) $(TARGET_RELEASETOOL_MAKE_RECOVERY_PATCH_SCRIPT) $(zip_root) $(zip_root) + $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ + $(TARGET_RELEASETOOL_MAKE_RECOVERY_PATCH_SCRIPT) $(zip_root) $(zip_root) endif ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE $(hide) build/tools/getb64key.py $(PRODUCT_DEFAULT_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt |