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

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

Specify --max_timestamp when calling brillo_update_payload. 

Bug: 36232423
Test: Create OTA packages (full, incremental and downgrade) with
      ota_from_target_files.py; check the parameters passed down to
      brillo_update_payload.
Change-Id: I3af397f05fe16f4a9f0eb73e8272bac6afdc002a
Merged-In: I3af397f05fe16f4a9f0eb73e8272bac6afdc002a
(cherry picked from commit ed08bc4a)
parent cde553f1

tools/releasetools/ota_from_target_files.py

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

  if source_file is not None:

    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=log_file, stderr=subprocess.STDOUT)

  p1.communicate()

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