From 58af58774d4b74b030f181d678714e0ea73152f9 Mon Sep 17 00:00:00 2001
From: inix <Nixy01@proton.me>
Date: Thu, 16 Oct 2025 04:47:00 +0200
Subject: [PATCH] fix rebase mistake

---
 src/android/app/build.gradle.kts | 34 +++++---------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index d9ae025b0b..e56b73cf7f 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -75,7 +75,10 @@ android {
         externalNativeBuild {
             cmake {
                 val extraCMakeArgs = (project.findProperty("YUZU_ANDROID_ARGS") as String?)?.split("\\s+".toRegex()) ?: emptyList()
-
+                val enableUpdater = when (System.getenv("DEVEL")) {
+                                    "false" -> "ON"
+                                    else -> "OFF"
+                                }
                 arguments.addAll(listOf(
                     "-DENABLE_QT=0", // Don't use QT
                     "-DENABLE_SDL2=0", // Don't use SDL
@@ -89,6 +92,7 @@ android {
                     "-DBUILD_TESTING=OFF",
                     "-DYUZU_TESTS=OFF",
                     "-DDYNARMIC_TESTS=OFF",
+                    "-DENABLE_UPDATE_CHECKER=$enableUpdater"
                     *extraCMakeArgs.toTypedArray()
                 ))
 
@@ -226,34 +230,6 @@ android {
         }
     }
 
-    defaultConfig {
-        externalNativeBuild {
-            cmake {
-                val enableUpdater = when (System.getenv("DEVEL")) {
-                    "false" -> "ON"
-                    else -> "OFF"
-                }
-                arguments(
-                    "-DENABLE_QT=0", // Don't use QT
-                    "-DENABLE_SDL2=0", // Don't use SDL
-                    "-DENABLE_WEB_SERVICE=1", // Enable web service
-                    "-DENABLE_OPENSSL=ON",
-                    "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
-                    "-DYUZU_USE_CPM=ON",
-                    "-DCPMUTIL_FORCE_BUNDLED=ON",
-                    "-DYUZU_USE_BUNDLED_FFMPEG=ON",
-                    "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
-                    "-DBUILD_TESTING=OFF",
-                    "-DYUZU_TESTS=OFF",
-                    "-DDYNARMIC_TESTS=OFF",
-                    "-DENABLE_UPDATE_CHECKER=$enableUpdater"
-                )
-
-                abiFilters("arm64-v8a")
-            }
-        }
-    }
-}
 
 tasks.register<Delete>("ktlintReset", fun Delete.() {
     delete(File(layout.buildDirectory.toString() + File.separator + "intermediates/ktLint"))