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

releasetools: Move recovery-two-step.img to OTA/.

Browse Source 
It used to be packed at IMAGES/recovery-two-step.img, but to serve OTA
purpose only.

Test: `m dist` with a non-A/B target. Check the file in the generated
      target_files.zip.
Test: Create two-step package. Check that recovery-two-step.img is used.
Change-Id: Iec6a73c682e0f844cd8c0b758c9470fa35dd15d8
This commit is contained in:
Tao Bao
2019-07-25 23:11:41 -07:00
parent 5da40edef0
commit 0480850f0b
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/validate_target_files.py
View File

@@ -257,7 +257,10 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options):
if verity_key is None:
verity_key = info_dict['verity_key'] + '.x509.pem'
for image in ('boot.img', 'recovery.img', 'recovery-two-step.img'):
image_path = os.path.join(input_tmp, 'IMAGES', image)
if image == 'recovery-two-step.img':
image_path = os.path.join(input_tmp, 'OTA', image)
else:
image_path = os.path.join(input_tmp, 'IMAGES', image)
if not os.path.exists(image_path):
continue