From 1a7485fda108310c7d5e6fbd6959349bb47a422a Mon Sep 17 00:00:00 2001
From: Mohamad Jaara <mohamad.jaara@wire.com>
Date: Thu, 7 Nov 2024 09:31:09 +0100
Subject: [PATCH 1/2] feat: disable x86 support

---
 app/build.gradle.kts                                 | 8 ++++++++
 buildSrc/src/main/kotlin/scripts/variants.gradle.kts | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 08f044e4fab..95f1951caee 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -61,6 +61,14 @@ private fun getFlavorsSettings(): NormalizedFlavorSettings =
 
 android {
     defaultConfig {
+        ndk {
+            abiFilters.apply {
+                add("armeabi-v7a")
+                add("arm64-v8a")
+                add("x86_64")
+            }
+        }
+
         val datadogApiKeyKey = "DATADOG_CLIENT_TOKEN"
         val datadogApiKey: String? = System.getenv(datadogApiKeyKey) ?: project.getLocalProperty(datadogApiKeyKey, null)
         buildConfigField("String", datadogApiKeyKey, datadogApiKey?.let { "\"$it\"" } ?: "null")
diff --git a/buildSrc/src/main/kotlin/scripts/variants.gradle.kts b/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
index b69ef44b9a3..5c7ed81c4ce 100644
--- a/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
+++ b/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
@@ -108,6 +108,7 @@ android {
     }
 
     buildTypes {
+        
         getByName(BuildTypes.DEBUG) {
             isMinifyEnabled = false
             applicationIdSuffix = ".${BuildTypes.DEBUG}"

From 94ead020e870ed76f9c30e42c50d1e0836e1db35 Mon Sep 17 00:00:00 2001
From: Mohamad Jaara <mohamad.jaara@wire.com>
Date: Tue, 26 Nov 2024 17:50:38 +0100
Subject: [PATCH 2/2] force x86_64

---
 .github/workflows/gradle-run-ui-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gradle-run-ui-tests.yml b/.github/workflows/gradle-run-ui-tests.yml
index 43ca3b9ce3b..aa665f635d9 100644
--- a/.github/workflows/gradle-run-ui-tests.yml
+++ b/.github/workflows/gradle-run-ui-tests.yml
@@ -56,6 +56,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           target: google_apis
+          arch: x86_64
           script: ./gradlew runAcceptanceTests
         env:
           GITHUB_USER: ${{ github.actor }}