Merge pull request #14892 from JosJuice/android-abis

Android: Set abiFilters for ndk

1 files changed, 6 insertions, 1 deletions

diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts
index 2fc4cb7a94..871f93fcd5 100644
--- a/Source/Android/app/build.gradle.kts
+++ b/Source/Android/app/build.gradle.kts
@@ -97,6 +97,12 @@ android {
     namespace = "org.dolphinemu.dolphinemu"
 
     defaultConfig {
+        ndk {
+            // We only officially support arm64-v8a and x86_64.
+            // If you want to try building other ABIs anyway, you need -DENABLE_GENERIC=ON.
+            abiFilters += listOf("arm64-v8a", "x86_64") //, "armeabi-v7a", "x86"
+        }
+
         externalNativeBuild {
             cmake {
                 arguments(
@@ -105,7 +111,6 @@ android {
                     "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                     // , "-DENABLE_GENERIC=ON"
                 )
-                abiFilters("arm64-v8a", "x86_64") //, "armeabi-v7a", "x86"
 
                 // Uncomment the line below if you don't want to build the C++ unit tests
                 //targets("main", "hook_impl", "main_hook", "gsl_alloc_hook", "file_redirect_hook")