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

Commit 1a03881e authored by Gabriele M's avatar Gabriele M
Browse files

Allow to force disable block based OTAs 

In some cases the same device tree is used to support different
device variants which could have different partition layouts.
In order to use block based OTAs, it is required to set the size
of the system partition equals to the smallest one. However, this
means wasting space on those devices that have a larger system
partition. Add a new board flag to force disable block based OTAs.
In this way the entire block is used to create the file system and
no space is wasted.

Change-Id: I90882a3833a5a50e3c2b8affed39c049a61b18ac
parent 543d7376

core/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -2148,6 +2148,9 @@ else 
endif

	$(hide) echo "ota_override_device=$(OTA_SCRIPT_OVERRIDE_DEVICE)" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "ota_override_prop=$(OTA_SCRIPT_OVERRIDE_PROP)" >> $(zip_root)/META/misc_info.txt

ifdef BOARD_DISABLE_BLOCK_BASED_OTA

	$(hide) echo "disable_block_based_ota=$(BOARD_DISABLE_BLOCK_BASED_OTA)" >> $(zip_root)/META/misc_info.txt

endif

ifdef BOARD_PREBUILT_VENDORIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDORIMAGE_TARGET) $(zip_root)/IMAGES/
@@ -2226,8 +2229,10 @@ ifneq ($(TARGET_UNIFIED_DEVICE),) 
endif



ifneq ($(BLOCK_BASED_OTA),false)

ifneq ($(BOARD_DISABLE_BLOCK_BASED_OTA),true)

    $(INTERNAL_OTA_PACKAGE_TARGET): block_based := --block

endif

endif



$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)

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

tools/releasetools/ota_from_target_files.py

+5 −0
Original line number Diff line number Diff line
@@ -2097,6 +2097,11 @@ def main(argv): 
  if "ota_override_prop" in OPTIONS.info_dict:

    OPTIONS.override_prop = OPTIONS.info_dict.get("ota_override_prop") == "true"



  disable_block_based_ota = OPTIONS.info_dict.get("disable_block_based_ota") == "true"

  if OPTIONS.block_based and disable_block_based_ota:

    print("Block based OTAs are disabled for this device")

    OPTIONS.block_based = False



  ab_update = OPTIONS.info_dict.get("ab_update") == "true"



  if ab_update: