Skip to content

Commit afcd76f

Browse files
authored
Merge pull request #75 from matrix-org/use_latest_ndk_env
2 parents 06c2dca + b1e8324 commit afcd76f

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

.github/workflows/release_crypto.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
target: [ "aarch64-linux-android", "armv7-linux-androideabi", "i686-linux-android", "x86_64-linux-android" ]
1919
name: "Build Rust target: ${{ matrix.target }}"
2020
runs-on: ubuntu-24.04
21+
env:
22+
NDK_VERSION: 28.2.13676358
2123
outputs:
2224
linkable_ref: ${{ steps.set_linkable_ref.outputs.linkable_ref }}
2325

@@ -48,6 +50,17 @@ jobs:
4850
- name: Install android sdk
4951
uses: malinskiy/action-android/install-sdk@release/0.1.4
5052

53+
- name: Configure android ndk
54+
run: |
55+
NDK_PATH=$ANDROID_HOME/ndk/$NDK_VERSION
56+
if [ -d "$NDK_PATH" ]; then
57+
echo "ANDROID_NDK_HOME=$NDK_PATH" >> $GITHUB_ENV
58+
echo "Using ndk $NDK_PATH"
59+
else
60+
echo "NDK_PATH not found, abort."
61+
exit 1
62+
fi
63+
5164
- name: Install Rust
5265
uses: dtolnay/rust-toolchain@stable
5366

.github/workflows/release_sdk_parallel.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
target: [ "aarch64-linux-android", "armv7-linux-androideabi", "i686-linux-android", "x86_64-linux-android" ]
1919
name: "Build Rust target: ${{ matrix.target }}"
2020
runs-on: ubuntu-24.04
21+
env:
22+
NDK_VERSION: 28.2.13676358
2123
outputs:
2224
linkable_ref: ${{ steps.set_linkable_ref.outputs.linkable_ref }}
2325

@@ -48,6 +50,17 @@ jobs:
4850
- name: Install android sdk
4951
uses: malinskiy/action-android/install-sdk@release/0.1.4
5052

53+
- name: Configure android ndk
54+
run: |
55+
NDK_PATH=$ANDROID_HOME/ndk/$NDK_VERSION
56+
if [ -d "$NDK_PATH" ]; then
57+
echo "ANDROID_NDK_HOME=$NDK_PATH" >> $GITHUB_ENV
58+
echo "Using ndk $NDK_PATH"
59+
else
60+
echo "NDK_PATH not found, abort."
61+
exit 1
62+
fi
63+
5164
- name: Install Rust
5265
uses: dtolnay/rust-toolchain@stable
5366

0 commit comments

Comments
 (0)