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

Commit 870f9729 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Always use recovery mount options." am: 643d466f am: 1709cf37 

am: 50aa7c73

* commit '50aa7c73':
  releasetools: Always use recovery mount options.
parents d2163bac 50aa7c73

tools/releasetools/ota_from_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -1572,13 +1572,13 @@ endif; 
  if OPTIONS.verify and system_diff:

    script.Print("Remounting and verifying system partition files...")

    script.Unmount("/system")

    script.Mount("/system")

    script.Mount("/system", recovery_mount_options)

    system_diff.EmitExplicitTargetVerification(script)



  if OPTIONS.verify and vendor_diff:

    script.Print("Remounting and verifying vendor partition files...")

    script.Unmount("/vendor")

    script.Mount("/vendor")

    script.Mount("/vendor", recovery_mount_options)

    vendor_diff.EmitExplicitTargetVerification(script)

  script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)