diff options
| author | Ying Wang <wangying@google.com> | 2014-06-18 18:36:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-18 18:36:56 +0000 |
| commit | 5d88b3d7d615995c6b1909992347fe0b5692492e (patch) | |
| tree | 327a087261f9fb18d1d70bf4fdc2794170b5a922 /core | |
| parent | 09a4cac12e3b040fb6d18490ff444b2fdd6cb451 (diff) | |
| parent | c426298280cea52af693ce76fe8643012ebe54b2 (diff) | |
| download | build-5d88b3d7d615995c6b1909992347fe0b5692492e.zip build-5d88b3d7d615995c6b1909992347fe0b5692492e.tar.gz build-5d88b3d7d615995c6b1909992347fe0b5692492e.tar.bz2 | |
am c4262982: Merge "Use the correct MKBOOTIMG."
* commit 'c426298280cea52af693ce76fe8643012ebe54b2':
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) \ |