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

Commit 0569b52b authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Check for vintf compatiblity early in generation process" am: 9fcdad62 am: 0f50d879 

Original change: https://android-review.googlesource.com/c/platform/build/+/1811778

Change-Id: Iffad6cbe52f659946aebe30f170370763d4eff2f
parents 18d6ad50 0f50d879

tools/releasetools/ota_from_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -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)