tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/tools/releasetools/merge
History
Dennis Song 4aae62ee77 Resolve conflict AVB rollback index location 
Add an `--avb-resolve-rollback-index-location-conflict`
option in merge_target_files. When this option is set,
the merge tool will resolve conflicting index locations
by assigning the smallest unused index location.

This is to support merging system and vendor target files
from two different targets. In this case, the two target
files may have conflict rollback index location because
they were built independently.

Test: atest releasetools_test
Test: validate_target_files *-target_files-*.zip
Test: merge_target_files &&
        add_img_to_target_files &&
        img_from_target_files &&
        flash device
Bug: 300604688
Change-Id: Ibd18ef2a9f3784157fe17966f5364c3c81c9bd9f
2023-10-04 06:45:15 +00:00
..
Android.bp Use apexd_host for host-side APEX extraction 2023-06-27 17:00:06 +09:00
merge_builds.py
merge_compatibility_checks.py Split the huge merge_target_files script into multiple files. 2022-03-10 23:56:00 +00:00
merge_dexopt.py Use apexd_host for host-side APEX extraction 2023-06-27 17:00:06 +09:00
merge_meta.py Respect framework partition set while merging meta files 2023-09-15 06:20:19 +00:00
merge_target_files.py Resolve conflict AVB rollback index location 2023-10-04 06:45:15 +00:00
merge_utils.py Remove system_dlkm from _FRAMEWORK_PARTITIONS 2023-08-04 07:08:17 +00:00
OWNERS Remove danielnorman@ from OWNERs. 2022-06-07 19:26:54 +00:00
test_merge_compatibility_checks.py Split the huge merge_target_files script into multiple files. 2022-03-10 23:56:00 +00:00
test_merge_meta.py Split the huge merge_target_files script into multiple files. 2022-03-10 23:56:00 +00:00
test_merge_utils.py Support merging target files from directory 2023-04-10 17:07:03 +08:00