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

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

Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev 

am: 5a4508bc

Change-Id: If09ef383865b95b7dd65522d7c369b98144c5520
parents b9a68b56 5a4508bc

tools/releasetools/ota_from_target_files.py

+33 −41
Original line number Diff line number Diff line
@@ -780,6 +780,32 @@ def AddToKnownPaths(filename, known_paths): 
    dirs.pop()





def HandleDowngradeMetadata(metadata):

  # Only incremental OTAs are allowed to reach here.

  assert OPTIONS.incremental_source is not None



  post_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.target_info_dict)

  pre_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.source_info_dict)

  is_downgrade = long(post_timestamp) < long(pre_timestamp)



  if OPTIONS.downgrade:

    metadata["ota-downgrade"] = "yes"

    if not is_downgrade:

      raise RuntimeError("--downgrade specified but no downgrade detected: "

                         "pre: %s, post: %s" % (pre_timestamp, post_timestamp))

  else:

    if is_downgrade:

      # Non-fatal here to allow generating such a package which may require

      # manual work to adjust the post-timestamp. A legit use case is that we

      # cut a new build C (after having A and B), but want to enfore the

      # update path of A -> C -> B. Specifying --downgrade may not help since

      # that would enforce a data wipe for C -> B update.

      print("\nWARNING: downgrade detected: pre: %s, post: %s.\n"

            "The package may not be deployed properly. "

            "Try --downgrade?\n" % (pre_timestamp, post_timestamp))

    metadata["post-timestamp"] = post_timestamp





def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):

  # TODO(tbao): We should factor out the common parts between

  # WriteBlockIncrementalOTAPackage() and WriteIncrementalOTAPackage().
@@ -811,26 +837,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): 
      "ota-type": "BLOCK",

  }



  post_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.target_info_dict)

  pre_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.source_info_dict)

  is_downgrade = long(post_timestamp) < long(pre_timestamp)



  if OPTIONS.downgrade:

    metadata["ota-downgrade"] = "yes"

    if not is_downgrade:

      raise RuntimeError("--downgrade specified but no downgrade detected: "

                         "pre: %s, post: %s" % (pre_timestamp, post_timestamp))

  else:

    if is_downgrade:

      # Non-fatal here to allow generating such a package which may require

      # manual work to adjust the post-timestamp. A legit use case is that we

      # cut a new build C (after having A and B), but want to enfore the

      # update path of A -> C -> B. Specifying --downgrade may not help since

      # that would enforce a data wipe for C -> B update.

      print("\nWARNING: downgrade detected: pre: %s, post: %s.\n"

            "The package may not be deployed properly. "

            "Try --downgrade?\n" % (pre_timestamp, post_timestamp))

    metadata["post-timestamp"] = post_timestamp

  HandleDowngradeMetadata(metadata)



  device_specific = common.DeviceSpecificParams(

      source_zip=source_zip,
@@ -1212,7 +1219,6 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file, 
                                              OPTIONS.info_dict),

      "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,

                                   OPTIONS.info_dict),

      "post-timestamp": GetBuildProp("ro.build.date.utc", OPTIONS.info_dict),

      "ota-required-cache": "0",

      "ota-type": "AB",

  }
@@ -1223,6 +1229,11 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file, 
    metadata["pre-build-incremental"] = GetBuildProp(

        "ro.build.version.incremental", OPTIONS.source_info_dict)



    HandleDowngradeMetadata(metadata)

  else:

    metadata["post-timestamp"] = GetBuildProp(

        "ro.build.date.utc", OPTIONS.info_dict)



  # 1. Generate payload.

  payload_file = common.MakeTempFile(prefix="payload-", suffix=".bin")

  cmd = ["brillo_update_payload", "generate",
@@ -1501,26 +1512,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): 
      "ota-type": "FILE",

  }



  post_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.target_info_dict)

  pre_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.source_info_dict)

  is_downgrade = long(post_timestamp) < long(pre_timestamp)



  if OPTIONS.downgrade:

    metadata["ota-downgrade"] = "yes"

    if not is_downgrade:

      raise RuntimeError("--downgrade specified but no downgrade detected: "

                         "pre: %s, post: %s" % (pre_timestamp, post_timestamp))

  else:

    if is_downgrade:

      # Non-fatal here to allow generating such a package which may require

      # manual work to adjust the post-timestamp. A legit use case is that we

      # cut a new build C (after having A and B), but want to enfore the

      # update path of A -> C -> B. Specifying --downgrade may not help since

      # that would enforce a data wipe for C -> B update.

      print("\nWARNING: downgrade detected: pre: %s, post: %s.\n"

            "The package may not be deployed properly. "

            "Try --downgrade?\n" % (pre_timestamp, post_timestamp))

    metadata["post-timestamp"] = post_timestamp

  HandleDowngradeMetadata(metadata)



  device_specific = common.DeviceSpecificParams(

      source_zip=source_zip,