diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-08-31 18:22:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-31 18:22:58 +0000 |
| commit | 9fcdad62c97f8c80eb532699dea21760cf65f7b8 (patch) | |
| tree | 38b6e579d33999a8c006496efdcb05874a8a389c | |
| parent | d4bea325301cd44100286249d7f013dafcf672e3 (diff) | |
| parent | 414ca429cf912266544847427be22d03e6413fe8 (diff) | |
| download | build-9fcdad62c97f8c80eb532699dea21760cf65f7b8.tar.gz | |
Merge "Check for vintf compatiblity early in generation process"
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 366b51a23c..38af0d4ee3 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1116,6 +1116,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): target_info.info_dict['ab_partitions'] = zfp.read( AB_PARTITIONS).decode().strip().split("\n") + CheckVintfIfTrebleEnabled(target_file, target_info) + # Metadata to comply with Android OTA package format. metadata = GetPackageMetadata(target_info, source_info) # Generate payload. @@ -1200,8 +1202,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): common.ZipClose(target_zip) - CheckVintfIfTrebleEnabled(target_file, target_info) - # We haven't written the metadata entry yet, which will be handled in # FinalizeMetadata(). common.ZipClose(output_zip) |