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

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

Store the value from BOARD_CUSTOM_BOOTIMG_MK to a file 

This is needed so it can be read in when re-signing a package to
use the proper boot image.

Print notice when using a custom bootimage makefile

Change-Id: I6baab9f8964ce5d4fa9487f2859af9c385d7b21b
parent cba66294

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,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

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, 
  custom_bootimg_mk = os.getenv('MKBOOTIMG')

  if custom_bootimg_mk:

    bootimage_path = os.path.join(os.getenv('OUT'), "boot.img")

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

    os.mkdir(prebuilt_dir)

    shutil.copyfile(bootimage_path, prebuilt_path)

  if os.path.exists(prebuilt_path):