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

Commit ed62f299 authored by Sen Jiang's avatar Sen Jiang Committed by android-build-merger
Browse files

Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c98 

am: 64e3da49

Change-Id: Ic2e9ff1ec09f81a6fc960663c4e3bca397d7784e
parents 5a53ba3e 64e3da49

tools/releasetools/ota_from_target_files.py

+5 −0
Original line number Original line Diff line number Diff line
@@ -1326,6 +1326,11 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file, 
         "--target_image", target_file]

         "--target_image", target_file]

  if source_file is not None:

  if source_file is not None:

    cmd.extend(["--source_image", source_file])

    cmd.extend(["--source_image", source_file])

  if OPTIONS.downgrade:

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

  else:

    max_timestamp = metadata["post-timestamp"]

  cmd.extend(["--max_timestamp", max_timestamp])

  p1 = common.Run(cmd, stdout=subprocess.PIPE)

  p1 = common.Run(cmd, stdout=subprocess.PIPE)

  p1.wait()

  p1.wait()

  assert p1.returncode == 0, "brillo_update_payload generate failed"

  assert p1.returncode == 0, "brillo_update_payload generate failed"