From 421fe44ae8e90a85b7f60ee6942687a51771b8b5 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Mon, 9 May 2016 22:24:50 -0700 Subject: [PATCH] Include vendor partitions in target zip generation This change will enable the target zip to include partition defined in BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support partitions other than boot and system in ab_partitions.txt. BUG: 28623063 Change-Id: I6e0969c31c9ad2e8285c6f560825c160aa8c4d55 --- core/Makefile | 8 ++++++++ tools/releasetools/add_img_to_target_files.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 6fb245891..6829193bf 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1640,6 +1640,10 @@ ifeq ($(TARGET_BUILD_TYPE),debug) endif name := $(name)-target_files-$(FILE_NAME_TAG) +ifdef BRILLO_VENDOR_PARTITIONS + vendor_partitions_intermediates := $(call intermediates-dir-for, PACKAGING, vendor-partitions) +endif + intermediates := $(call intermediates-dir-for,PACKAGING,target_files) BUILT_TARGET_FILES_PACKAGE := $(intermediates)/$(name).zip $(BUILT_TARGET_FILES_PACKAGE): intermediates := $(intermediates) @@ -1873,6 +1877,10 @@ 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 + @mkdir -p $(zip_root)/VENDOR_IMAGES + $(hide) $(ACP) -r -d -p $(vendor_partitions_intermediates)/*.img $(zip_root)/VENDOR_IMAGES +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 diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index f98a281fe..48d5bfd9d 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -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/. 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,14 @@ 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_path = os.path.join( + OPTIONS.input_tmp, "VENDOR_IMAGES", img_name) if os.path.exists(img_radio_path): common.ZipWrite(output_zip, img_radio_path, os.path.join("IMAGES", img_name)) + elif os.path.exists(img_vendor_path): + common.ZipWrite(output_zip, img_vendor_path, + os.path.join("IMAGES", img_name)) # Zip spec says: All slashes MUST be forward slashes. img_path = 'IMAGES/' + img_name -- 2.11.0