commit 629bc8dc1cd2846661c192df912468c8620155a5
author Kelvin Zhang <zhangkelvin@google.com> Tue Apr 11 21:08:27 2023 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Apr 11 21:30:42 2023 -0700
tree ecbf3d8d0c012e66580b1eed05c06ab1dfc346ea
parent ea84d421999fcc33a7b903d6194b8087bf77440a

Fix s to t OTA

Android S update_engine has a smaller minor version, we should use
update_engine version number from source build when generating an
incremental OTA.

Test: th
Bug: 277837157
Change-Id: Ic1ccdccd26c19bf9fb13d146a9151e699e481201

tools/releasetools/ota_utils.py

diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index c419537..8c26114 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -839,6 +839,9 @@
 
     major_version, minor_version = ParseUpdateEngineConfig(
         os.path.join(target_dir, "META", "update_engine_config.txt"))
+    if source_file:
+      major_version, minor_version = ParseUpdateEngineConfig(
+          os.path.join(source_dir, "META", "update_engine_config.txt"))
     if self.minor_version:
       minor_version = self.minor_version
     cmd.extend(["--major_version", str(major_version)])