3 Commits

Author	SHA1	Message	Date
Kelvin Zhang	fa40c04cba	Fix recovery OTA error on merged targets ... Currently, when merging target files, system side's update_engine version info is copied into the merged target_files. This causes recovery OTA failure, because update_engine_sideload daemon in recovery is from vendor side. To fix it, use the older version of update_engine config when merging target files. Test: th Bug: 257426678 Change-Id: I5d3304366749995c99a61ca0645a22ee047f1465	2022-11-09 14:43:17 -08:00
Daniel Norman	5f47677f00	Infer merge configs if not provided. ... Bug: 221858722 Test: Create a merged package using inferred configs. Test: atest --host releasetools_test Change-Id: I93d67ca0f00be3f0e0424ed0a1e44c39ca2f3094	2022-03-10 23:56:12 +00:00
Daniel Norman	2465fc8594	Split the huge merge_target_files script into multiple files. ... Bug: 221858722 Test: m otatools; Use to create merged builds Test: atest --host releasetools_test Change-Id: I5f932f160d3f6405b41a7721b1c75cc96749e77b	2022-03-10 23:56:00 +00:00