From 87015f013a5528e850d188f2b9cbcc5fbed88610 Mon Sep 17 00:00:00 2001
From: Neuman Vong <neuman.vong@gmail.com>
Date: Tue, 16 Jan 2024 15:15:00 +1100
Subject: [PATCH] Rename CI prop to skip-armeabi-v7a

---
 .github/workflows/build.yml                 | 4 +++-
 examples/llama.android/app/build.gradle.kts | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2891de706..367df07a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -536,7 +536,9 @@ jobs:
       - name: Build
         run: |
           cd examples/llama.android
-          ./gradlew build --no-daemon -Ponly-arm64-v8a
+
+          # Skip armeabi-v7a for now (https://github.com/llvm/llvm-project/issues/65820).
+          ./gradlew build --no-daemon -Pskip-armeabi-v7a
 
 #  freeBSD-latest:
 #    runs-on: macos-12
diff --git a/examples/llama.android/app/build.gradle.kts b/examples/llama.android/app/build.gradle.kts
index 107a226fa..7815a8025 100644
--- a/examples/llama.android/app/build.gradle.kts
+++ b/examples/llama.android/app/build.gradle.kts
@@ -22,10 +22,10 @@ android {
         }
         ndk {
             // Workaround for https://github.com/llvm/llvm-project/issues/65820
-            // affecting armeabi-v7a. Build for arm64-v8a only when invoked
-            // with -Ponly-arm64-v8a (e.g. ./gradlew build -Ponly-arm64-v8a).
-            if (project.hasProperty("only-arm64-v8a")) {
-                abiFilters += listOf("arm64-v8a")
+            // affecting armeabi-v7a. Skip armeabi-v7a when invoked with
+            // -Pskip-armeabi-v7a (e.g., ./gradlew build -Pskip-armeabi-v7a).
+            if (project.hasProperty("skip-armeabi-v7a")) {
+                abiFilters += listOf("arm64-v8a", "x86_64", "x86")
             }
         }
         externalNativeBuild {