From bc3600c030d410afb5708087e7dd4d68ee874cf1 Mon Sep 17 00:00:00 2001 From: Paul Trautrim Date: Tue, 13 Aug 2019 18:07:03 +0900 Subject: [PATCH] Use --add_missing in merge_target_files.py This is needed when including prebuilt images that do not need to be regenerated. Otherwise the script will exit upon detecting an existing IMAGES/ directory. Test: test_merge_target_files Bug: 139111475 Change-Id: I55d82bd7dc4fa5f27bc01e481362e79fecc200ff --- tools/releasetools/merge_target_files.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index cfffbc7352..b7ed6458ae 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -781,6 +781,7 @@ def generate_images(target_files_dir, rebuild_recovery): # Regenerate IMAGES in the target directory. add_img_args = ['--verbose'] + add_img_args.append('--add_missing') if rebuild_recovery: add_img_args.append('--rebuild_recovery') add_img_args.append(target_files_dir)