Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a33a4a72 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Nolen Johnson
Browse files

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
parent 24252730

tools/releasetools/ota_from_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -1901,6 +1901,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  elif OPTIONS.skip_postinstall:

    target_file = GetTargetFilesZipWithoutPostinstallConfig(target_file)



  CheckVintfIfTrebleEnabled(target_file, target_info)



  # Generate payload.

  payload = Payload()
@@ -1954,8 +1956,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)