commit 513b86e5c210b2d9f73c1a2bd2272ea4c3f94a58
author Kelvin Zhang <zhangkelvin@google.com> Fri Oct 27 13:27:07 2023 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Mon Oct 30 23:43:15 2023 +0000
tree 8a3d6b3c97d76d5a5ec68bbb592f3ec14a38fcc9
parent 4fd3b11018be3ad520324d300a98e0bb73fd844f

Move more non-AB code to separate files

non-AB has different lifetime and development cycles from AB. To avoid
accidentally breaking each other when making changes, put non-AB code in
its own files.

Test: local non-AB OTA generation
Bug: 296485685

Merged-In: I0736ecef343834c746464666a454a8bfcd4a20ea

Change-Id: I0736ecef343834c746464666a454a8bfcd4a20ea

tools/releasetools/make_recovery_patch.py

diff --git a/tools/releasetools/make_recovery_patch.py b/tools/releasetools/make_recovery_patch.py
index 1497d69..397bf23 100644
--- a/tools/releasetools/make_recovery_patch.py
+++ b/tools/releasetools/make_recovery_patch.py
@@ -21,6 +21,7 @@
 import sys
 
 import common
+from non_ab_ota import MakeRecoveryPatch
 
 if sys.hexversion < 0x02070000:
   print("Python 2.7 or newer is required.", file=sys.stderr)
@@ -60,7 +61,7 @@
                            *fn.split("/")), "wb") as f:
       f.write(data)
 
-  common.MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img)
+  MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img)
 
 
 if __name__ == '__main__':