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

Commit 50a144b7 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "dynamic_partition_use -> use_dynamic_partitions." am: 9b024fe5 

am: 0d69a137

Change-Id: I04da384285b4e30dc84f525c661c413534e2fb66
parents b0b8814c 0d69a137

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3672,7 +3672,7 @@ ifdef BUILT_VENDOR_MATRIX 
	$(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml

endif

ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

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

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

endif

ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)

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

tools/releasetools/ota_from_target_files.py

+3 −3
Original line number Diff line number Diff line
@@ -2013,10 +2013,10 @@ def main(argv): 
  OPTIONS.oem_dicts = _LoadOemDicts(OPTIONS.oem_source)



  # Assume retrofitting dynamic partitions when base build does not set

  # dynamic_partition_use but target build does.

  # use_dynamic_partitions but target build does.

  if (OPTIONS.source_info_dict and

      OPTIONS.source_info_dict.get("dynamic_partition_use") != "true" and

      OPTIONS.target_info_dict.get("dynamic_partition_use") == "true"):

      OPTIONS.source_info_dict.get("use_dynamic_partitions") != "true" and

      OPTIONS.target_info_dict.get("use_dynamic_partitions") == "true"):

    if OPTIONS.target_info_dict.get("dynamic_partition_retrofit") != "true":

      raise common.ExternalError(

          "Expect to generate incremental OTA for retrofitting dynamic "