From 48959e0bb3a3f29086f0ae796ecf000fb5bf1089 Mon Sep 17 00:00:00 2001
From: Bisuh Kapoho Furio <bisuhkfurio@proton.me>
Date: Thu, 22 Jan 2026 06:24:50 +0000
Subject: [PATCH 1/2] add otatools_files

---
 Android.bp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000000..24815b7518
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,18 @@
+soong_namespace {}
+
+genrule {
+    name: "otatools_files",
+    tools: ["soong_zip"],
+    cmd: "mkdir -p $(genDir)/script && " +
+        "cp $(in) $(genDir)/script && " +
+        "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)/script",
+    srcs: [
+        "common.sh",
+        "decrypt-keys",
+        "encrypt-keys",
+        "generate-metadata",
+        "generate-release.sh",
+        "generate-delta.sh",
+    ],
+    out: ["otatools_files.zip"],
+}

From b7015e03703288be1659b609412330c783682f7c Mon Sep 17 00:00:00 2001
From: Bisuh Kapoho Furio <bisuhkfurio@proton.me>
Date: Sat, 31 Jan 2026 22:42:20 +0000
Subject: [PATCH 2/2] use soong otatools.zip in finalize.sh

---
 finalize.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/finalize.sh b/finalize.sh
index ffb18dd5f2..23e0a09229 100755
--- a/finalize.sh
+++ b/finalize.sh
@@ -11,5 +11,6 @@ source "$(dirname ${BASH_SOURCE[0]})/common.sh"
 
 readonly releases=releases/$BUILD_NUMBER
 mkdir -p $releases
-cp "$OUT/otatools.zip" "$releases/$TARGET_PRODUCT-otatools.zip"
+otatools="${ANDROID_BUILD_TOP}/out/soong/.intermediates/build/make/tools/otatools_package/otatools-package/linux_glibc_x86_64/gen/otatools.zip"
+cp "${otatools}" "$releases/$TARGET_PRODUCT-otatools.zip"
 cp "$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files.zip" "$releases/"