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

Commit 648ea82b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"

parents a55b7ec4 2e735ca3

core/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -1873,6 +1873,17 @@ ifeq ($(AB_OTA_UPDATER),true) 
	@# Include the build type in META/misc_info.txt so the server can easily differentiate production builds.

	$(hide) echo "build_type=$(TARGET_BUILD_VARIANT)" >> $(zip_root)/META/misc_info.txt

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

ifdef BRILLO_VENDOR_PARTITIONS

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

	$(hide) for f in $(BRILLO_VENDOR_PARTITIONS); do \

	  pair1="$$(echo $$f | awk -F':' '{print $$1}')"; \

	  pair2="$$(echo $$f | awk -F':' '{print $$2}')"; \

	  src=$${pair1}/$${pair2}; \

	  dest=$(zip_root)/VENDOR_IMAGES/$${pair2}; \

	  mkdir -p $$(dirname "$${dest}"); \

	  $(ACP) $${src} $${dest}; \

	done;

endif

ifdef OSRELEASED_DIRECTORY

	$(hide) $(ACP) $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/product_id $(zip_root)/META/product_id.txt

	$(hide) $(ACP) $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/product_version $(zip_root)/META/product_version.txt

tools/releasetools/add_img_to_target_files.py

+11 −2
Original line number Diff line number Diff line
@@ -395,8 +395,9 @@ def AddImagesToTargetFiles(filename): 
    banner("partition-table")

    AddPartitionTable(output_zip)



  # For devices using A/B update, copy over images from RADIO/ to IMAGES/ and

  # make sure we have all the needed images ready under IMAGES/.

  # For devices using A/B update, copy over images from RADIO/ and/or

  # VENDOR_IMAGES/ to IMAGES/ and make sure we have all the needed

  # images ready under IMAGES/. All images should have '.img' as extension.

  ab_partitions = os.path.join(OPTIONS.input_tmp, "META", "ab_partitions.txt")

  if os.path.exists(ab_partitions):

    with open(ab_partitions, 'r') as f:
@@ -404,9 +405,17 @@ def AddImagesToTargetFiles(filename): 
    for line in lines:

      img_name = line.strip() + ".img"

      img_radio_path = os.path.join(OPTIONS.input_tmp, "RADIO", img_name)

      img_vendor_dir = os.path.join(

        OPTIONS.input_tmp, "VENDOR_IMAGES")

      if os.path.exists(img_radio_path):

        common.ZipWrite(output_zip, img_radio_path,

                        os.path.join("IMAGES", img_name))

      else:

        for root, _, files in os.walk(img_vendor_dir):

          if img_name in files:

            common.ZipWrite(output_zip, os.path.join(root, img_name),

              os.path.join("IMAGES", img_name))

            break



      # Zip spec says: All slashes MUST be forward slashes.

      img_path = 'IMAGES/' + img_name