From 9e8a64f3c1642f5e0d595b10ba0d44475e8e611c Mon Sep 17 00:00:00 2001
From: Dan Miller <dan@cypherstack.com>
Date: Wed, 27 May 2026 13:28:21 -0700
Subject: [PATCH 1/2] Use android docker image in ci for android builds.

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 462c524294..d6da51a2dc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -102,7 +102,7 @@ jobs:
       contents: read
       packages: read
     container:
-      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
+      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
       credentials:
         username: ${{ github.actor }}
         password: ${{ github.token }}
@@ -743,7 +743,7 @@ jobs:
       contents: read
       packages: read
     container:
-      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
+      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
       credentials:
         username: ${{ github.actor }}
         password: ${{ github.token }}
@@ -1201,7 +1201,7 @@ jobs:
       contents: read
       packages: read
     container:
-      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
+      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
       credentials:
         username: ${{ github.actor }}
         password: ${{ github.token }}

From 852cd78d2b09cbd696de872458bd8597ad53f98c Mon Sep 17 00:00:00 2001
From: Dan Miller <dan@cypherstack.com>
Date: Wed, 27 May 2026 13:46:29 -0700
Subject: [PATCH 2/2] ci: bake missing Android SDK components into CI image

---
 Dockerfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 265b9d86a1..42ac5c65b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,8 +63,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "platforms;android-32" \
+      "platforms;android-33" \
+      "platforms;android-34" \
       "platforms;android-35" \
+      "platforms;android-36" \
+      "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
+      "cmake;3.22.1" \
  && chmod -R a+rwX "$ANDROID_SDK_ROOT"
 
 ENV PATH=/usr/local/go/bin:$PATH
@@ -142,8 +148,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "platforms;android-32" \
+      "platforms;android-33" \
+      "platforms;android-34" \
       "platforms;android-35" \
+      "platforms;android-36" \
+      "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
+      "cmake;3.22.1" \
  && chmod -R a+rwX "$ANDROID_SDK_ROOT"
 
 ENV PATH=/usr/local/go/bin:$PATH