From 467687935dbe2faf6dd128aa241ff0d43c3e9c33 Mon Sep 17 00:00:00 2001
From: Berend Sliedrecht <sliedrecht@berend.io>
Date: Tue, 19 Dec 2023 18:20:26 +0100
Subject: [PATCH] build(android): fix rust version issue

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
---
 .github/workflows/build.yml |  4 +---
 Cross.toml                  | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 954505ac..6271b651 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -399,8 +399,6 @@ jobs:
   build-android:
     name: Build library (Android)
     needs: [checks]
-    env:
-      RUST_VERSION: "1.67"
 
     runs-on: ubuntu-latest
 
@@ -431,7 +429,7 @@ jobs:
 
       - name: Build
         run: |
-          cargo install --bins --git https://github.com/rust-embedded/cross --tag v${{ env.CROSS_VERSION }} cross
+          cargo install cross --version 0.2.5 
           # Required for compatibility with manylinux2014:
           # https://github.com/briansmith/ring/issues/1728
           if [ "${{ matrix.target }}" = "aarch64-linux-android" ]; then
diff --git a/Cross.toml b/Cross.toml
index cffaca78..9e8f2635 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -7,14 +7,14 @@ image = "ghcr.io/rust-cross/manylinux2014-cross:aarch64"
 [target.x86_64-unknown-linux-gnu]
 image = "ghcr.io/rust-cross/manylinux2014-cross:x86_64"
 
-[target.x86_64-linux-android]
-image = "ghcr.io/hyperledger/aries-builder-images/cross/x86_64-linux-android:main"
-
-[target.i686-linux-android]
-image = "ghcr.io/hyperledger/aries-builder-images/cross/i686-linux-android:main"
-
-[target.aarch64-linux-android]
-image = "ghcr.io/hyperledger/aries-builder-images/cross/aarch64-linux-android:main"
-
-[target.armv7-linux-androideabi]
-image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"
+# [target.x86_64-linux-android]
+# image = "ghcr.io/hyperledger/aries-builder-images/cross/x86_64-linux-android:main"
+# 
+# [target.i686-linux-android]
+# image = "ghcr.io/hyperledger/aries-builder-images/cross/i686-linux-android:main"
+# 
+# [target.aarch64-linux-android]
+# image = "ghcr.io/hyperledger/aries-builder-images/cross/aarch64-linux-android:main"
+# 
+# [target.armv7-linux-androideabi]
+# image = "ghcr.io/hyperledger/aries-builder-images/cross/armv7-linux-androideabi:main"