From 8cb547c3edc6cdfd10527f67e8014208841cb647 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Mon, 17 Apr 2023 09:16:29 +0800
Subject: [PATCH] [skip ci] Revert "Let AGP to strip native libs" (#2498)

Reverts LSPosed/LSPosed#2496
---
 .github/workflows/core.yml       | 9 ++++++---
 build.gradle.kts                 | 5 +++++
 core/src/main/jni/CMakeLists.txt | 3 +--
 daemon/build.gradle.kts          | 3 ---
 magisk-loader/build.gradle.kts   | 4 ----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 98e3e16c..c7176b8d 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -112,9 +112,12 @@ jobs:
           path: |
             magisk-loader/build/outputs/mapping
             app/build/outputs/mapping
-            daemon/build/outputs/mapping
-            magisk-loader/build/outputs/native-debug-symbols
-            daemon/build/outputs/native-debug-symbols
+
+      - name: Upload symbols
+        uses: actions/upload-artifact@v3
+        with:
+          name: symbols
+          path: build/symbols
 
       - name: Post to channel
         if: ${{ success() && github.event_name != 'pull_request' && github.ref == 'refs/heads/master' && github.ref_type != 'tag' && inputs.post_telegram != 'false' }}
diff --git a/build.gradle.kts b/build.gradle.kts
index e0a13777..db13ac6c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -47,6 +47,11 @@ cmaker {
         cppFlags.addAll(flags)
         abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
     }
+    buildTypes {
+        if (it.name == "release") {
+            arguments += "-DDEBUG_SYMBOLS_PATH=${buildDir.absolutePath}/symbols"
+        }
+    }
 }
 
 val repo = jgit.repo()
diff --git a/core/src/main/jni/CMakeLists.txt b/core/src/main/jni/CMakeLists.txt
index 3567302c..7e455793 100644
--- a/core/src/main/jni/CMakeLists.txt
+++ b/core/src/main/jni/CMakeLists.txt
@@ -1,6 +1,5 @@
-cmake_minimum_required(VERSION 3.4.1)
-
 project(core)
+cmake_minimum_required(VERSION 3.4.1)
 
 add_subdirectory(${EXTERNAL_ROOT} external)
 
diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
index 0cb1d232..2c56efa4 100644
--- a/daemon/build.gradle.kts
+++ b/daemon/build.gradle.kts
@@ -52,9 +52,6 @@ android {
         )
         buildConfigField("String", "MANAGER_INJECTED_PKG_NAME", """"$injectedPackageName"""")
         buildConfigField("int", "MANAGER_INJECTED_UID", """$injectedPackageUid""")
-        ndk {
-            debugSymbolLevel = "FULL"
-        }
     }
 
     buildTypes {
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index 807034a2..d95613bc 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -63,9 +63,6 @@ android {
         )
         buildConfigField("String", "MANAGER_INJECTED_PKG_NAME", """"$injectedPackageName"""")
         buildConfigField("int", "MANAGER_INJECTED_UID", """$injectedPackageUid""")
-        ndk {
-            debugSymbolLevel = "FULL"
-        }
     }
 
     buildTypes {
@@ -148,7 +145,6 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
             "assemble$variantCapped",
             ":app:package$buildTypeCapped",
             ":daemon:package$buildTypeCapped",
-            ":daemon:merge${buildTypeCapped}NativeDebugMetadata",
             ":dex2oat:externalNativeBuild${buildTypeCapped}"
         )
         into(magiskDir)