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

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

releasetools: Properly handle custom values for tools 

Rather than writing these values to their own files, store them
in the target_files META/misc_info.txt. This way, we don't need to
download and parse through multiple files when using signing/release
tools.

Change-Id: I6f845fc055e4ef2ed4adf9628cca505e99b2a9fa
(cherry picked from commit d8b439ae)
parent 10f88830

core/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -1391,6 +1391,16 @@ endif 
	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "ota_script_path=$(OTA_FROM_TARGET_SCRIPT)" >> $(zip_root)/META/misc_info.txt

ifdef TARGET_OTA_ASSERT_DEVICE

	$(hide) echo "override_device=$(TARGET_OTA_ASSERT_DEVICE)" >> $(zip_root)/META/misc_info.txt

endif

ifdef BOARD_CUSTOM_BOOTIMG_MK

	$(hide) echo "custom_bootimg_mk=$(BOARD_CUSTOM_BOOTIMG_MK)" >> $(zip_root)/META/misc_info.txt

endif

ifdef TARGET_UNIFIED_DEVICE

	$(hide) echo "override_prop=true" >> $(zip_root)/META/misc_info.txt

endif

	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)

ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

	$(hide) build/tools/getb64key.py $(PRODUCT_DEFAULT_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt
@@ -1458,9 +1468,6 @@ ifneq ($(TARGET_NO_SEPARATE_RECOVERY),) 
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 \