From 855b17c2ee711904becd43f46c96a5c83f9e19a8 Mon Sep 17 00:00:00 2001
From: zeus <nicolastinkl@gmail.com>
Date: Fri, 18 Jul 2025 14:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Android=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=AF=91=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E7=BB=86=E8=AF=B7=E7=9C=8Bhttps://github.com?=
 =?UTF-8?q?/nicolastinkl/UUVPN/issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 Android 版本编译出错问题，详细请看https://github.com/nicolastinkl/UUVPN/issues
---
 .gitignore                                      | 1 +
 Android-kotlin-Code/core/build.gradle.kts       | 3 ++-
 Android-kotlin-Code/core/src/main/cpp/version.h | 2 +-
 Android-kotlin-Code/gradle.properties           | 3 ++-
 Android-kotlin-Code/local.properties            | 9 ++++-----
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13ad845..169a47c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,3 +139,4 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 !.vscode/settings.json
+/Android-kotlin-Code/core/.cxx
diff --git a/Android-kotlin-Code/core/build.gradle.kts b/Android-kotlin-Code/core/build.gradle.kts
index bf6626f..d3ea39c 100644
--- a/Android-kotlin-Code/core/build.gradle.kts
+++ b/Android-kotlin-Code/core/build.gradle.kts
@@ -46,8 +46,9 @@ android {
     externalNativeBuild {
         cmake {
             // 设置cmake版本
-            version = "3.31.6"
+//            version = "3.31.6"  //macos下不需要指定 cmake 的版本信息
             path = file("src/main/cpp/CMakeLists.txt")
+
         }
     }
 }
diff --git a/Android-kotlin-Code/core/src/main/cpp/version.h b/Android-kotlin-Code/core/src/main/cpp/version.h
index 03d8e7e..f628bce 100644
--- a/Android-kotlin-Code/core/src/main/cpp/version.h
+++ b/Android-kotlin-Code/core/src/main/cpp/version.h
@@ -5,7 +5,7 @@
  * 当前编译core版本号
  */
  
-#define GIT_VERSION _920e728_241219
+#define GIT_VERSION 
 #define make_Str(x) #x 
 #define make_String(x) make_Str(x)
 
diff --git a/Android-kotlin-Code/gradle.properties b/Android-kotlin-Code/gradle.properties
index e129df1..eba3a58 100644
--- a/Android-kotlin-Code/gradle.properties
+++ b/Android-kotlin-Code/gradle.properties
@@ -6,7 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8
+#org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:+UseG1GC
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/Android-kotlin-Code/local.properties b/Android-kotlin-Code/local.properties
index 20a2110..1b0969b 100644
--- a/Android-kotlin-Code/local.properties
+++ b/Android-kotlin-Code/local.properties
@@ -4,8 +4,7 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Dec 11 11:56:02 CST 2024
-sdk.dir=/Volumes/TOSHIBA/androidstudio/sdk
-
-# 设置cmake(使用android studio SDK manager安装)路径至版本
-cmake.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk\\cmake\\3.31.6
+#Fri Jul 18 13:36:50 CST 2025
+#cmake.dir=/Volumes/WD/androidstudio/sdk/cmake/3.22.1
+# C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk\\cmake\\3.31.6
+sdk.dir=/Volumes/WD/androidstudio/sdk