commit 414ca429cf912266544847427be22d03e6413fe8
author Kelvin Zhang <zhangkelvin@google.com> Fri Aug 27 15:12:08 2021 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Aug 31 11:22:34 2021 -0700
tree 38b6e579d33999a8c006496efdcb05874a8a389c
parent d4bea325301cd44100286249d7f013dafcf672e3

Check for vintf compatiblity early in generation process

Currently CheckVintfIfTrebleEnabled is called after generating payload.
Users have to wait for ~1 hour before vintf is checked. Do the check
early and fail early.

Test: th
Change-Id: I2e4a8c7eaa62c94c92973c127b1d825a26e63b35

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 366b51a..38af0d4 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1116,6 +1116,8 @@
     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 @@
 
   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)