StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: common.LoadInfoDict() takes a bool parameter for repacking.

Browse Source 
It used to accept a non-None input_dir to indicate the need to
re-generate images (called from add_img_to_target_files.py). During that
flow, both of the two parameters redundantly refer to the same input
dir. This CL replaces the second parameter with a bool value instead.

Test: `python -m unittest test_common`
Test: `m dist` with aosp_taimen-userdebug
Test: `zip -d aosp_taimen-target_files-eng.zip IMAGES/\* &&
       add_img_to_target_files.py -a aosp_taimen-target_files-eng.zip`
Change-Id: I0a5a164366acb116407f94bb350872a3a0b207d1
This commit is contained in:
Tao Bao
2018-08-24 12:08:38 -07:00
parent acdaa8fbac
commit 410ad8bb92
3 changed files with 86 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/add_img_to_target_files.py
View File

@@ -664,7 +664,7 @@ def AddImagesToTargetFiles(filename):
print("target_files appears to already contain images.")
sys.exit(1)
OPTIONS.info_dict = common.LoadInfoDict(OPTIONS.input_tmp, OPTIONS.input_tmp)
OPTIONS.info_dict = common.LoadInfoDict(OPTIONS.input_tmp, repacking=True)
has_recovery = OPTIONS.info_dict.get("no_recovery") != "true"