From 94bc266f4a0bc883b6240cc5d403b01e0f6cad93 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 10 Sep 2025 09:22:15 +0200
Subject: [PATCH 1/5] Try to fix android

---
 codec-native-quic/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codec-native-quic/pom.xml b/codec-native-quic/pom.xml
index e1014fcb..7f53b0de 100644
--- a/codec-native-quic/pom.xml
+++ b/codec-native-quic/pom.xml
@@ -788,7 +788,7 @@
                       <equals arg1="${platform}" arg2="android" />
                       <then>
                         <exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
-                          <arg line="ndk ${cargoTarget} -p ${androidNdkVersion} -- build -p quiche --features &quot;ffi qlog&quot; --release" />
+                          <arg line="ndk -t ${androidAbi} ${cargoTarget} -p ${androidNdkVersion} -- build -p quiche --features &quot;ffi qlog&quot; --release" />
                           <env key="CFLAGS" value="${extraCflags}" />
                           <env key="CXXFLAGS" value="${extraCxxflags}" />
                           <env key="QUICHE_BSSL_PATH" value="${boringsslHomeDir}/" />

From 3788ddbde93d742dd57f7a1cb03be73b51748cd6 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 10 Sep 2025 09:23:28 +0200
Subject: [PATCH 2/5] Only try android

---
 .github/workflows/ci-pr.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index b1e2b71f..3daf75b3 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -61,6 +61,7 @@ jobs:
 
     runs-on: ubuntu-latest
     name: ${{ matrix.setup }} build
+    if: false
     steps:
       - uses: actions/checkout@v4
 
@@ -113,6 +114,7 @@ jobs:
   build-pr-windows:
     runs-on: windows-2022
     name: windows-x86_64 build
+    if: false
     env:
       # Let's limit the amount of ram that is used to unpack rustup as we saw
       # failures sometimes due the fact that not enough memory could be reserved.
@@ -191,6 +193,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     name:  ${{ matrix.setup }}  build
+    if: false
 
     steps:
       - uses: actions/checkout@v4

From 6cdcf3ed2700631ea3315b0b2ddeda3d06abc980 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 10 Sep 2025 10:23:44 +0200
Subject: [PATCH 3/5] Next try

---
 codec-native-quic/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codec-native-quic/pom.xml b/codec-native-quic/pom.xml
index 7f53b0de..668a464e 100644
--- a/codec-native-quic/pom.xml
+++ b/codec-native-quic/pom.xml
@@ -788,7 +788,7 @@
                       <equals arg1="${platform}" arg2="android" />
                       <then>
                         <exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
-                          <arg line="ndk -t ${androidAbi} ${cargoTarget} -p ${androidNdkVersion} -- build -p quiche --features &quot;ffi qlog&quot; --release" />
+                          <arg line="ndk ${cargoTarget} --plattform ${androidNdkVersion} -- build -p quiche --features &quot;ffi qlog&quot; --release" />
                           <env key="CFLAGS" value="${extraCflags}" />
                           <env key="CXXFLAGS" value="${extraCxxflags}" />
                           <env key="QUICHE_BSSL_PATH" value="${boringsslHomeDir}/" />

From a31355fc86957efc585b3801672bac9d250ac9ad Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 10 Sep 2025 10:31:25 +0200
Subject: [PATCH 4/5] toolchain

---
 .github/workflows/ci-pr.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 3daf75b3..bc96eff8 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -256,8 +256,11 @@ jobs:
         with:
           crate: cargo-ndk
 
-      - name: Install Rust toolchain for Android architectures
-        run: rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
+      - name: Install stable toolchain for the target
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          targets: aarch64-linux-android,armv7-linux-androideabi,i686-linux-android,x86_64-linux-android
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v4

From f0bd9d6fdab4491b004adf0c9e8d31c444c2aea5 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 10 Sep 2025 10:35:19 +0200
Subject: [PATCH 5/5] Fix typo

---
 codec-native-quic/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codec-native-quic/pom.xml b/codec-native-quic/pom.xml
index 668a464e..20e0d8ed 100644
--- a/codec-native-quic/pom.xml
+++ b/codec-native-quic/pom.xml
@@ -788,7 +788,7 @@
                       <equals arg1="${platform}" arg2="android" />
                       <then>
                         <exec executable="cargo" failonerror="true" dir="${quicheSourceDir}" resolveexecutable="true">
-                          <arg line="ndk ${cargoTarget} --plattform ${androidNdkVersion} -- build -p quiche --features &quot;ffi qlog&quot; --release" />
+                          <arg line="ndk ${cargoTarget} --platform ${androidNdkVersion} -- build -p quiche --features &quot;ffi qlog&quot; --release" />
                           <env key="CFLAGS" value="${extraCflags}" />
                           <env key="CXXFLAGS" value="${extraCxxflags}" />
                           <env key="QUICHE_BSSL_PATH" value="${boringsslHomeDir}/" />