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

Commit 17ddde03 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Revert "Revert "releasetools: bring back boot.img handling"" 

This reverts commit 9f7b879d.
parent 5c84893b

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,7 @@ endif 
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path

	@echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device

	@echo "$(BOARD_CUSTOM_BOOTIMG_MK)" > $(PRODUCT_OUT)/ota_custom_bootimg_mk

	@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"

	MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \

	$(OTA_FROM_TARGET_SCRIPT) -v \

tools/releasetools/common.py

+7 −0
Original line number Diff line number Diff line
@@ -350,6 +350,13 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, 


  prebuilt_dir = os.path.join(unpack_dir, "BOOTABLE_IMAGES")

  prebuilt_path = os.path.join(prebuilt_dir, prebuilt_name)

  custom_bootimg_mk = os.getenv('MKBOOTIMG')

  if custom_bootimg_mk:

    bootimage_path = os.path.join(os.getenv('OUT'), prebuilt_name)

    print "using custom bootimage makefile %s..." % (custom_bootimg_mk,)

    if not os.path.isdir(prebuilt_dir):

        os.mkdir(prebuilt_dir)

    shutil.copyfile(bootimage_path, prebuilt_path)

  if os.path.exists(prebuilt_path):

    print "using prebuilt %s..." % (prebuilt_name,)

    return File.FromLocalFile(name, prebuilt_path)