@@ -165,33 +165,25 @@ jobs:
165165 - name : Install Android NDK
166166 if : ${{ matrix.android }}
167167 run : |
168- wget https://dl.google.com/android/repository/android-ndk-r23b-linux.zip
169- unzip android-ndk-r23b-linux.zip
170- export TOOLCHAIN="${PWD}/android-ndk-r23b/toolchains/llvm/prebuilt/linux-x86_64/bin"
171- echo "$TOOLCHAIN" >> $GITHUB_PATH
172- ln -s "$TOOLCHAIN/llvm-ar" "$TOOLCHAIN/${{ matrix.target }}-ar"
173- ln -s "$TOOLCHAIN/llvm-ar" "$TOOLCHAIN/arm-linux-androideabi-ar"
168+ wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
169+ sha1sum android-ndk-r25c-linux.zip | grep '53af80a1cce9144025b81c78c8cd556bff42bd0e'
170+ unzip android-ndk-r25c-linux.zip
171+ echo "ANDROID_NDK_HOME=${PWD}/android-ndk-r25c" >> $GITHUB_ENV
172+
173+ - name : Install cargo-ndk
174+ if : ${{ matrix.android }}
175+ run : cargo install cargo-ndk
174176
175177 - name : Build (Core)
176- uses : actions-rs/cargo@v1
177- with :
178- command : build
179- args : --verbose --release --target=${{ matrix.target }} ${{ matrix.features }} ${{ matrix.additionalFeatures }} -p jpki
178+ run : cargo +stable build --verbose --release --target=${{ matrix.target }} ${{ matrix.features }} ${{ matrix.additionalFeatures }} -p jpki
180179
181180 - name : Build (CLI)
182181 if : ${{ matrix.cli }}
183- uses : actions-rs/cargo@v1
184- with :
185- command : build
186- args : --verbose --release --target=${{ matrix.target }} -p jpki-cli
182+ run : cargo +stable build --verbose --release --target=${{ matrix.target }} -p jpki-cli
187183
188184 - name : Build (Android)
189185 if : ${{ matrix.android }}
190- uses : actions-rs/cargo@v1
191- with :
192- command : build
193- args : --verbose --release --target=${{ matrix.target }} -p jpki-ffi-android
194- use-cross : true
186+ run : cargo ndk --target=${{ matrix.target }} build --verbose --release -p jpki-ffi-android
195187
196188 - name : Compress artifacts into .tar.gz file
197189 if : ${{ matrix.cli }}
0 commit comments