From 6d80cd62fd87e449af42560aea2b4935dcb3da9e Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 3 Dec 2022 14:41:54 +0800
Subject: [PATCH] Stablize CMake arguments (#2266)

---
 build.gradle.kts                 | 2 --
 core/.gitignore                  | 1 +
 core/build.gradle.kts            | 8 ++++++++
 core/src/main/jni/CMakeLists.txt | 4 +---
 magisk-loader/build.gradle.kts   | 1 -
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 892bc534..30dfe947 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -125,8 +125,6 @@ fun Project.configureBaseExtension() {
                     cFlags("-std=c18", *flags)
                     arguments(
                         "-DANDROID_STL=none",
-                        "-DVERSION_CODE=$verCode",
-                        "-DVERSION_NAME=$verName",
                     )
                     findInPath("ccache")?.let {
                         println("Using ccache $it")
diff --git a/core/.gitignore b/core/.gitignore
index 9ff2a377..035d07e5 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,2 +1,3 @@
 /build
 /.cxx
+/src/main/jni/src/config.cpp
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ba67e002..9d105deb 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -18,6 +18,8 @@
  */
 
 val apiCode: Int by rootProject.extra
+val verName: String by rootProject.extra
+val verCode: Int by rootProject.extra
 
 plugins {
     id("com.android.library")
@@ -43,6 +45,12 @@ android {
         }
     }
 }
+copy {
+    from("src/main/jni/template/") {
+        expand("VERSION_CODE" to "$verCode", "VERSION_NAME" to verName)
+    }
+    into("src/main/jni/src/")
+}
 
 dependencies {
     implementation("org.apache.commons:commons-lang3:3.12.0")
diff --git a/core/src/main/jni/CMakeLists.txt b/core/src/main/jni/CMakeLists.txt
index 73cca55e..7e455793 100644
--- a/core/src/main/jni/CMakeLists.txt
+++ b/core/src/main/jni/CMakeLists.txt
@@ -3,12 +3,10 @@ cmake_minimum_required(VERSION 3.4.1)
 
 add_subdirectory(${EXTERNAL_ROOT} external)
 
-configure_file(template/config.cpp src/config.cpp)
-
 aux_source_directory(src SRC_LIST)
 aux_source_directory(src/jni SRC_LIST)
 
-add_library(${PROJECT_NAME} STATIC ${SRC_LIST} ${CMAKE_CURRENT_BINARY_DIR}/src/config.cpp)
+add_library(${PROJECT_NAME} STATIC ${SRC_LIST})
 
 target_include_directories(${PROJECT_NAME} PUBLIC include)
 target_include_directories(${PROJECT_NAME} PRIVATE src)
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index aff285b3..6d40dc50 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -122,7 +122,6 @@ dependencies {
 
 val zipAll = task("zipAll") {
     group = "LSPosed"
-
 }
 
 fun afterEval() = android.applicationVariants.forEach { variant ->