diff options
Diffstat (limited to 'tools/releasetools/validate_target_files.py')
| -rwxr-xr-x | tools/releasetools/validate_target_files.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/tools/releasetools/validate_target_files.py b/tools/releasetools/validate_target_files.py index 82b31076f7..8da4fa2e8a 100755 --- a/tools/releasetools/validate_target_files.py +++ b/tools/releasetools/validate_target_files.py @@ -361,18 +361,15 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options): "Mismatching mincrypt verity key files" logging.info('Verified the content of /verity_key') - # For devices with a separate ramdisk (i.e. non-system-as-root), there must - # be a copy in ramdisk. - if info_dict.get("system_root_image") != "true": - verity_key_ramdisk = os.path.join( - input_tmp, 'BOOT', 'RAMDISK', 'verity_key') - assert os.path.exists( - verity_key_ramdisk), 'Missing verity_key in ramdisk' - - assert filecmp.cmp( - verity_key_mincrypt, verity_key_ramdisk, shallow=False), \ - 'Mismatching verity_key files in root and ramdisk' - logging.info('Verified the content of /verity_key in ramdisk') + verity_key_ramdisk = os.path.join( + input_tmp, 'BOOT', 'RAMDISK', 'verity_key') + assert os.path.exists( + verity_key_ramdisk), 'Missing verity_key in ramdisk' + + assert filecmp.cmp( + verity_key_mincrypt, verity_key_ramdisk, shallow=False), \ + 'Mismatching verity_key files in root and ramdisk' + logging.info('Verified the content of /verity_key in ramdisk') # Then verify the verity signed system/vendor/product images, against the # verity pubkey in mincrypt format. |