6 Commits

Author	SHA1	Message	Date
Daniel Norman	679242b877	Infers custom vendor partitions. ... Rather than hardcoding a list of allowed vendor partitions, we accept anything in the vendor target files that is not a framework partition. Also extend support for inferred misc_info keys when the device uses SYSTEM/product or SYSTEM/system_ext. Test: test --host releasetools_test Test: Use to merge a device with a custom IMAGES/*.img in the vendor build, and SYSTEM/system_ext in the system build. Bug: 225902565 Change-Id: I638c0f9c019357150516ea6c208ecd60c03c450f	2022-04-29 15:07:48 -07:00
jiangxu5	2bd4273865	[Bugfix] Check for presence before moving ... There are vendor products but no *.map situation Signed-off-by: jiangxu5 <jiangxu5@xiaomi.com> Change-Id: I5068abd1f81bca53ffcbdd415874b8fb49408e30	2022-04-21 09:33:31 +08:00
Rob Seymour	c4e2754380	Update extract items call in merge_dexopt. ... Test: merge builds with VSDK image Change-Id: I7788164ecbd69408d2293f49b98ab88db67e9cd9	2022-03-15 17:43:51 +00: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
Daniel Norman	2b0b9ca1b7	Moves merge scripts into a new merge folder. ... This will be used in the following change to split merge_target_files into a collection of smaller more-focused scripts. Bug: 221858722 Test: m otatools; Use to create merged builds Change-Id: Ie01dac81c5f9f28f1e0fe037259eabd2478e60b6	2022-03-08 16:37:14 -08:00