p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Fix a broken test due to verity utils relocation." am: 1e5a23f9b0 

am: 39eb5ff367

Change-Id: I8248702c2b67b6b49b20b3cead11980288853339
This commit is contained in:
Tao Bao 2018-10-14 08:25:11 -07:00 committed by android-build-merger
parent 6ad6eccca3 39eb5ff367
commit e3c845ba2b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/test_validate_target_files.py
View File

@ -20,9 +20,9 @@ import os
import os.path
import shutil
import build_image
import common
import test_utils
import verity_utils
from validate_target_files import ValidateVerifiedBootImages
@ -109,7 +109,7 @@ class ValidateTargetFilesTest(test_utils.ReleaseToolsTestCase):
def _generate_system_image(self, output_file):
verity_fec = True
partition_size = 1024 * 1024
image_size, verity_size = build_image.AdjustPartitionSizeForVerity(
image_size, verity_size = verity_utils.AdjustPartitionSizeForVerity(
partition_size, verity_fec)
# Use an empty root directory.
@ -132,7 +132,7 @@ class ValidateTargetFilesTest(test_utils.ReleaseToolsTestCase):
'verity_signer_cmd' : 'verity_signer',
'verity_size' : str(verity_size),
}
build_image.MakeVerityEnabledImage(output_file, verity_fec, prop_dict)
verity_utils.MakeVerityEnabledImage(output_file, verity_fec, prop_dict)
def test_ValidateVerifiedBootImages_systemImage(self):
input_tmp = common.MakeTempDir()