commit bc3600c030d410afb5708087e7dd4d68ee874cf1
author Paul Trautrim <paultrautrim@google.com> Tue Aug 13 18:07:03 2019 +0900
committer Paul Trautrim <paultrautrim@google.com> Tue Aug 13 19:24:12 2019 +0900
tree 698758d976c7c61cd991609b9ec8b648781b78ad
parent ba6135bd80e9d7a8b655b432adc4eef1e8e29e21

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

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index cfffbc7..b7ed645 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -781,6 +781,7 @@
   # 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)