diff options
| author | Ying Wang <wangying@google.com> | 2014-06-18 18:32:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-17 21:36:55 +0000 |
| commit | c426298280cea52af693ce76fe8643012ebe54b2 (patch) | |
| tree | 0364eb5e2fdb42a09a8b239a1eec24e06757a1af /core | |
| parent | 7cc3174d9ca26c3170e201dd73f8d83bcfe27cf3 (diff) | |
| parent | 42c980433113950e0bfc53de3b8656dd525411df (diff) | |
| download | build-c426298280cea52af693ce76fe8643012ebe54b2.zip build-c426298280cea52af693ce76fe8643012ebe54b2.tar.gz build-c426298280cea52af693ce76fe8643012ebe54b2.tar.bz2 | |
Merge "Use the correct MKBOOTIMG."
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 083d3c9..853bd44 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1315,7 +1315,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package OTA: $@" - $(hide) MKBOOTIMG=$(BOARD_CUSTOM_MKBOOTIMG) \ + $(hide) MKBOOTIMG=$(MKBOOTIMG) \ ./build/tools/releasetools/ota_from_target_files -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ @@ -1344,7 +1344,7 @@ endif $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package: $@" - $(hide) MKBOOTIMG=$(BOARD_CUSTOM_MKBOOTIMG) \ + $(hide) MKBOOTIMG=$(MKBOOTIMG) \ ./build/tools/releasetools/img_from_target_files -v \ -s $(extensions) \ -p $(HOST_OUT) \ |