From 616cf70a801ccf7c2312118d163185a8d341e517 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Thu, 16 Mar 2023 11:56:51 -0400
Subject: build: only enable adrenotools on arm64

---
 src/android/app/build.gradle                | 5 ++---
 src/android/app/src/main/jni/CMakeLists.txt | 5 ++++-
 src/android/app/src/main/jni/native.cpp     | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/android/app')

diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle
index 8b621f5d5..7e2717b11 100644
--- a/src/android/app/build.gradle
+++ b/src/android/app/build.gradle
@@ -10,7 +10,6 @@ plugins {
  */
 def autoVersion = (int) (((new Date().getTime() / 1000) - 1451606400) / 10)
 def buildType
-def abiFilter = "arm64-v8a" //, "x86"
 
 android {
     namespace 'org.yuzu.yuzu_emu'
@@ -44,7 +43,7 @@ android {
         targetSdkVersion 33
         versionCode autoVersion
         versionName getVersion()
-        ndk.abiFilters abiFilter
+        ndk.abiFilters "arm64-v8a", "x86_64"
     }
 
     signingConfigs {
@@ -115,7 +114,7 @@ android {
                         "-DYUZU_USE_BUNDLED_VCPKG=ON",
                         "-DYUZU_USE_BUNDLED_FFMPEG=ON"
 
-                abiFilters abiFilter
+                abiFilters "arm64-v8a", "x86_64"
             }
         }
     }
diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt
index f80c166f4..21c27d4ee 100644
--- a/src/android/app/src/main/jni/CMakeLists.txt
+++ b/src/android/app/src/main/jni/CMakeLists.txt
@@ -13,6 +13,9 @@ add_library(yuzu-android SHARED
 set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})
 
 target_link_libraries(yuzu-android PRIVATE audio_core common core input_common)
-target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad inih jnigraphics adrenotools log)
+target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad inih jnigraphics log)
+if (ARCHITECTURE_arm64)
+    target_link_libraries(yuzu-android PRIVATE adrenotools)
+endif()
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android)
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 3cfbec87c..6e670e899 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -7,7 +7,9 @@
 #include <string_view>
 #include <dlfcn.h>
 
+#ifdef ARCHITECTURE_arm64
 #include <adrenotools/driver.h>
+#endif
 
 #include <android/api-level.h>
 #include <android/native_window_jni.h>
@@ -76,6 +78,7 @@ public:
     void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
                              const std::string& custom_driver_name,
                              const std::string& file_redirect_dir) {
+#ifdef ARCHITECTURE_arm64
         void* handle{};
         const char* file_redirect_dir_{};
         int featureFlags{};
@@ -101,6 +104,7 @@ public:
         }
 
         m_vulkan_library = std::make_shared<Common::DynamicLibrary>(handle);
+#endif
     }
 
     bool IsRunning() const {
-- 
cgit v1.2.3