修复 Android 版本编译出错问题,详细请看https://github.com/nicolastinkl/UUVPN/issues

修复 Android 版本编译出错问题,详细请看https://github.com/nicolastinkl/UUVPN/issues
This commit is contained in:
zeus
2025-07-18 14:27:58 +08:00
parent 3d946b66ab
commit 855b17c2ee
5 changed files with 10 additions and 8 deletions
+1
View File
@@ -139,3 +139,4 @@ app.*.symbols
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
!/dev/ci/**/Gemfile.lock !/dev/ci/**/Gemfile.lock
!.vscode/settings.json !.vscode/settings.json
/Android-kotlin-Code/core/.cxx
+2 -1
View File
@@ -46,8 +46,9 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
// 设置cmake版本 // 设置cmake版本
version = "3.31.6" // version = "3.31.6" //macos下不需要指定 cmake 的版本信息
path = file("src/main/cpp/CMakeLists.txt") path = file("src/main/cpp/CMakeLists.txt")
} }
} }
} }
@@ -5,7 +5,7 @@
* 当前编译core版本号 * 当前编译core版本号
*/ */
#define GIT_VERSION _920e728_241219 #define GIT_VERSION
#define make_Str(x) #x #define make_Str(x) #x
#define make_String(x) make_Str(x) #define make_String(x) make_Str(x)
+2 -1
View File
@@ -6,7 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # 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. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # 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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+4 -5
View File
@@ -4,8 +4,7 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Wed Dec 11 11:56:02 CST 2024 #Fri Jul 18 13:36:50 CST 2025
sdk.dir=/Volumes/TOSHIBA/androidstudio/sdk #cmake.dir=/Volumes/WD/androidstudio/sdk/cmake/3.22.1
# C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk\\cmake\\3.31.6
# 设置cmake(使用android studio SDK manager安装)路径至版本 sdk.dir=/Volumes/WD/androidstudio/sdk
cmake.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk\\cmake\\3.31.6