3 Commits

Author	SHA1	Message	Date
Daniel Norman	55417148f9	Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts. ... All callers of this function now always pass the same values, so this change hardcodes those values within the function body. Fix: 145008064 Test: python -m unittest test_common Test: build & boot a merged target that uses DAP Change-Id: I0051c5ba507983231825edfcaf349e574efa451a	2019-11-26 11:09:17 -08:00
Daniel Norman	276f06275b	Adds support for optionally generating vbmeta.img in merge_builds. ... Bug: 137853921 Bug: 138671115 Test: python -m unittest test_common Test: python -m unittest test_add_img_to_target_files Test: Ran 'merge_builds --build_vbmeta' for two devices, one with the vbmeta struct on system.img and another with vbmeta_system.img. Flashed the regenerated vbmeta.img files on devices, devices boot. Change-Id: I8d7585c7af468be3d242d8aceeed6d27e6fc6d96	2019-08-02 20:13:03 +00:00
Daniel Norman	bfc51efa97	Adds new merge builds script for use in merging two non-dist builds. ... Bug: 137853921 Test: python -m unittest test_common Test: python -m unittest test_merge_target_files Test: Built two partial builds without dist. Ran out/host/linux-x86/bin/merge_builds. Flashed using `fastboot flashall`. Device boots. Change-Id: Iffd0a447cdf19a7775a813b4b896178aa6f861f3	2019-07-29 16:30:56 +00:00