Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69c27d9a authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 88440c53: am 5d88b3d7: am c4262982: Merge "Use the correct MKBOOTIMG." 

* commit '88440c53':
  Use the correct MKBOOTIMG.
parents 96b55967 88440c53

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1376,7 +1376,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 \

	   --block \

	   -p $(HOST_OUT) \
@@ -1405,7 +1405,7 @@ INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip 


$(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 \

	   -p $(HOST_OUT) \

	   $(BUILT_TARGET_FILES_PACKAGE) $@