StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose --avb_resolve_rollback_index_location_conflict" into main am: 4605c0ec76 am: 60046f4d0a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2851825

Change-Id: I3d85d392f1a32a373751a00081ec9a1fcb241e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Song
2023-11-29 09:56:19 +00:00
committed by Automerger Merge Worker
parent 167c2d8f24 60046f4d0a
commit 0ce2277a45
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/merge/merge_builds.py
View File

@@ -47,6 +47,10 @@ Usage: merge_builds.py [args]
The optional path to a newline-separated config file containing keys to The optional path to a newline-separated config file containing keys to
obtain from the framework instance of misc_info.txt, used for creating obtain from the framework instance of misc_info.txt, used for creating
vbmeta.img. The remaining keys come from the vendor instance. vbmeta.img. The remaining keys come from the vendor instance.
--avb_resolve_rollback_index_location_conflict
If provided, resolve the conflict AVB rollback index location when
necessary.
""" """
from __future__ import print_function from __future__ import print_function
@@ -65,6 +69,7 @@ OPTIONS.product_out_framework = None
OPTIONS.product_out_vendor = None OPTIONS.product_out_vendor = None
OPTIONS.build_vbmeta = False OPTIONS.build_vbmeta = False
OPTIONS.framework_misc_info_keys = None OPTIONS.framework_misc_info_keys = None
OPTIONS.avb_resolve_rollback_index_location_conflict = False
def CreateImageSymlinks(): def CreateImageSymlinks():
@@ -140,7 +145,8 @@ def BuildVBMeta():
output_vbmeta_path = os.path.join(OPTIONS.product_out_vendor, "vbmeta.img") output_vbmeta_path = os.path.join(OPTIONS.product_out_vendor, "vbmeta.img")
OPTIONS.info_dict = merged_dict OPTIONS.info_dict = merged_dict
common.BuildVBMeta(output_vbmeta_path, partitions, "vbmeta", common.BuildVBMeta(output_vbmeta_path, partitions, "vbmeta",
vbmeta_partitions) vbmeta_partitions,
OPTIONS.avb_resolve_rollback_index_location_conflict)
def MergeBuilds(): def MergeBuilds():
@@ -164,6 +170,8 @@ def main():
OPTIONS.build_vbmeta = True OPTIONS.build_vbmeta = True
elif o == "--framework_misc_info_keys": elif o == "--framework_misc_info_keys":
OPTIONS.framework_misc_info_keys = a OPTIONS.framework_misc_info_keys = a
elif o == "--avb_resolve_rollback_index_location_conflict":
OPTIONS.avb_resolve_rollback_index_location_conflict = True
else: else:
return False return False
return True return True
@@ -177,6 +185,7 @@ def main():
"product_out_vendor=", "product_out_vendor=",
"build_vbmeta", "build_vbmeta",
"framework_misc_info_keys=", "framework_misc_info_keys=",
"avb_resolve_rollback_index_location_conflict"
], ],
extra_option_handler=option_handler) extra_option_handler=option_handler)