From a40cf53f8290351a1da62729ec3ff12217750a12 Mon Sep 17 00:00:00 2001
From: Steve Kirkland-Walton <steve@bugsnag.com>
Date: Wed, 15 Nov 2023 16:24:36 +0000
Subject: [PATCH] Build test fixtures with NDK for all architectures [full ci]

---
 .../features/fixtures/rn0_60/android/app/build.gradle           | 2 +-
 .../features/fixtures/rn0_61/android/app/build.gradle           | 2 +-
 .../features/fixtures/rn0_62/android/app/build.gradle           | 2 +-
 .../features/fixtures/rn0_63/android/app/build.gradle           | 2 +-
 test/react-native/TESTING.md                                    | 2 +-
 .../features/fixtures/rn0.60/android/app/build.gradle           | 2 +-
 .../features/fixtures/rn0.66/android/app/build.gradle           | 2 +-
 .../features/fixtures/rn0.67/android/app/build.gradle           | 2 +-
 .../features/fixtures/rn0.68-hermes/android/app/build.gradle    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/react-native-cli/features/fixtures/rn0_60/android/app/build.gradle b/test/react-native-cli/features/fixtures/rn0_60/android/app/build.gradle
index eedaa162dd..f53e375b2f 100644
--- a/test/react-native-cli/features/fixtures/rn0_60/android/app/build.gradle
+++ b/test/react-native-cli/features/fixtures/rn0_60/android/app/build.gradle
@@ -135,7 +135,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native-cli/features/fixtures/rn0_61/android/app/build.gradle b/test/react-native-cli/features/fixtures/rn0_61/android/app/build.gradle
index 4c50e4206d..d049f26b78 100644
--- a/test/react-native-cli/features/fixtures/rn0_61/android/app/build.gradle
+++ b/test/react-native-cli/features/fixtures/rn0_61/android/app/build.gradle
@@ -135,7 +135,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native-cli/features/fixtures/rn0_62/android/app/build.gradle b/test/react-native-cli/features/fixtures/rn0_62/android/app/build.gradle
index 12c9a32db4..9fe27998c2 100644
--- a/test/react-native-cli/features/fixtures/rn0_62/android/app/build.gradle
+++ b/test/react-native-cli/features/fixtures/rn0_62/android/app/build.gradle
@@ -136,7 +136,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native-cli/features/fixtures/rn0_63/android/app/build.gradle b/test/react-native-cli/features/fixtures/rn0_63/android/app/build.gradle
index e5fa81f211..ba57583e4b 100644
--- a/test/react-native-cli/features/fixtures/rn0_63/android/app/build.gradle
+++ b/test/react-native-cli/features/fixtures/rn0_63/android/app/build.gradle
@@ -136,7 +136,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native/TESTING.md b/test/react-native/TESTING.md
index 900a71dbbb..31c027650f 100644
--- a/test/react-native/TESTING.md
+++ b/test/react-native/TESTING.md
@@ -127,7 +127,7 @@ Remove
     1. In app/build.gradle:
         - add Kotlin
         - add Bugsnag
-        - add NDK `abiFilters "arm64-v8a", "x86"`
+        - add NDK `abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"`
     1. In gradle.properties, set org.gradle.jvmargs=-Xmx4096m  
     1. In app/proguard-rules.pro, add:
         ```
diff --git a/test/react-native/features/fixtures/rn0.60/android/app/build.gradle b/test/react-native/features/fixtures/rn0.60/android/app/build.gradle
index 4f55f07683..b52287fb16 100644
--- a/test/react-native/features/fixtures/rn0.60/android/app/build.gradle
+++ b/test/react-native/features/fixtures/rn0.60/android/app/build.gradle
@@ -136,7 +136,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native/features/fixtures/rn0.66/android/app/build.gradle b/test/react-native/features/fixtures/rn0.66/android/app/build.gradle
index 7ce63370c9..48451635ec 100644
--- a/test/react-native/features/fixtures/rn0.66/android/app/build.gradle
+++ b/test/react-native/features/fixtures/rn0.66/android/app/build.gradle
@@ -139,7 +139,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native/features/fixtures/rn0.67/android/app/build.gradle b/test/react-native/features/fixtures/rn0.67/android/app/build.gradle
index cc60db40c4..6c4fe9938a 100644
--- a/test/react-native/features/fixtures/rn0.67/android/app/build.gradle
+++ b/test/react-native/features/fixtures/rn0.67/android/app/build.gradle
@@ -139,7 +139,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     splits {
diff --git a/test/react-native/features/fixtures/rn0.68-hermes/android/app/build.gradle b/test/react-native/features/fixtures/rn0.68-hermes/android/app/build.gradle
index 13a8cb08bb..4d873acac0 100644
--- a/test/react-native/features/fixtures/rn0.68-hermes/android/app/build.gradle
+++ b/test/react-native/features/fixtures/rn0.68-hermes/android/app/build.gradle
@@ -144,7 +144,7 @@ android {
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         ndk {
-            abiFilters "arm64-v8a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
 
         if (isNewArchitectureEnabled()) {