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

Commit fa41fb27 authored by Tao Bao's avatar Tao Bao
Browse files

Use the update-binary in the source build for downgrade OTAs. 

We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.

Bug: 27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit 4996cf03)
parent 177c610e

tools/releasetools/ota_from_target_files.py

+15 −3
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
      build to an older one (based on timestamp comparison). "post-timestamp"

      will be replaced by "ota-downgrade=yes" in the metadata file. A data

      wipe will always be enforced, so "ota-wipe=yes" will also be included in

      the metadata file.

      the metadata file. The update-binary in the source build will be used in

      the OTA package, unless --binary flag is specified.



  -e  (--extra_script)  <file>

      Insert the contents of file at the end of the update script.
@@ -1008,6 +1009,11 @@ endif; 
""" % bcb_dev)



  script.SetProgress(1)

  # For downgrade OTAs, we prefer to use the update-binary in the source

  # build that is actually newer than the one in the target build.

  if OPTIONS.downgrade:

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

  else:

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

  WriteMetadata(metadata, output_zip)
@@ -1543,6 +1549,12 @@ endif; 
    script.Unmount("/vendor")

    script.Mount("/vendor")

    vendor_diff.EmitExplicitTargetVerification(script)



  # For downgrade OTAs, we prefer to use the update-binary in the source

  # build that is actually newer than the one in the target build.

  if OPTIONS.downgrade:

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

  else:

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



  WriteMetadata(metadata, output_zip)