Skip to content

Commit 4511d28

Browse files
committed
Update build.yml
1 parent 1643f5b commit 4511d28

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,42 +32,43 @@ jobs:
3232
distribution: 'temurin'
3333
java-version: 17
3434

35+
- name: Install Ninja
36+
run: |
37+
sudo apt update
38+
sudo apt install ninja-build
39+
3540
- name: Setup Android SDK
3641
uses: android-actions/setup-android@v3
3742

38-
- name: Accept licenses
39-
run: |
40-
yes | sdkmanager --licenses
41-
4243
- name: Install packages
43-
run: yes | sdkmanager "cmake;3.31.5" "ndk;r28
44+
run: yes | sdkmanager "cmake;3.31.5" "ndk;27.0.12077973"
4445

4546
- name: Configure arm64-v8a
4647
run: |
47-
/opt/android-sdk/cmake/3.31.5/bin/cmake \
48+
$ANDROID_SDK_ROOT/cmake/3.31.5/bin/cmake \
4849
-Bbuild-arm64-v8a -DANDROID_ABI=arm64-v8a \
4950
-DANDROID_PLATFORM=android-31 \
50-
-DANDROID_NDK=/opt/android-sdk/ndk/27.* \
51-
-DCMAKE_TOOLCHAIN_FILE=/opt/android-sdk/ndk/27.*/build/cmake/android.toolchain.cmake \
51+
-DANDROID_NDK=$ANDROID_SDK_ROOT/ndk/27.0.12077973 \
52+
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_SDK_ROOT/ndk/27.0.12077973/build/cmake/android.toolchain.cmake \
5253
-DCMAKE_BUILD_TYPE=Release -G Ninja
5354
5455
- name: Configure x86-64
5556
run: |
56-
/opt/android-sdk/cmake/3.31.5/bin/cmake \
57+
$ANDROID_SDK_ROOT/cmake/3.31.5/bin/cmake \
5758
-Bbuild-x86-64 -DANDROID_ABI=x86_64 \
5859
-DANDROID_PLATFORM=android-31 \
59-
-DANDROID_NDK=/opt/android-sdk/ndk/27.* \
60-
-DCMAKE_TOOLCHAIN_FILE=/opt/android-sdk/ndk/27.*/build/cmake/android.toolchain.cmake \
60+
-DANDROID_NDK=$ANDROID_SDK_ROOT/ndk/27.0.12077973 \
61+
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_SDK_ROOT/ndk/27.0.12077973/build/cmake/android.toolchain.cmake \
6162
-DCMAKE_BUILD_TYPE=Release -G Ninja
6263
6364
- name: Build arm64-v8a
6465
run: |
65-
/opt/android-sdk/cmake/3.31.5/bin/cmake --build build-arm64-v8a --target package
66+
$ANDROID_SDK_ROOT/cmake/3.31.5/bin/cmake --build build-arm64-v8a --target package
6667
mv build-arm64-v8a/llvm-20.1.0-Android.tar.gz llvm-20.1.0-arm64-v8a-Android.tar.gz
6768
6869
- name: Build x86-64
6970
run: |
70-
/opt/android-sdk/cmake/3.31.5/bin/cmake --build build-x86-64 --target package
71+
$ANDROID_SDK_ROOT/cmake/3.31.5/bin/cmake --build build-x86-64 --target package
7172
mv build-arm64-v8a/llvm-20.1.0-Android.tar.gz llvm-20.1.0-x86-64-Android.tar.gz
7273
7374
- name: Create release

0 commit comments

Comments
 (0)