Skip to content

Commit 87015f0

Browse files
committed
Rename CI prop to skip-armeabi-v7a
1 parent abfc518 commit 87015f0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,9 @@ jobs:
536536
- name: Build
537537
run: |
538538
cd examples/llama.android
539-
./gradlew build --no-daemon -Ponly-arm64-v8a
539+
540+
# Skip armeabi-v7a for now (https://github.com/llvm/llvm-project/issues/65820).
541+
./gradlew build --no-daemon -Pskip-armeabi-v7a
540542
541543
# freeBSD-latest:
542544
# runs-on: macos-12

examples/llama.android/app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ android {
2222
}
2323
ndk {
2424
// Workaround for https://github.com/llvm/llvm-project/issues/65820
25-
// affecting armeabi-v7a. Build for arm64-v8a only when invoked
26-
// with -Ponly-arm64-v8a (e.g. ./gradlew build -Ponly-arm64-v8a).
27-
if (project.hasProperty("only-arm64-v8a")) {
28-
abiFilters += listOf("arm64-v8a")
25+
// affecting armeabi-v7a. Skip armeabi-v7a when invoked with
26+
// -Pskip-armeabi-v7a (e.g., ./gradlew build -Pskip-armeabi-v7a).
27+
if (project.hasProperty("skip-armeabi-v7a")) {
28+
abiFilters += listOf("arm64-v8a", "x86_64", "x86")
2929
}
3030
}
3131
externalNativeBuild {

0 commit comments

Comments
 (0)