Android

.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
@@ -253,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

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 ${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}/" />