细化+上游代理+1.1

app/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     id("org.jetbrains.kotlin.plugin.compose")
 }
 
-val minSdk = 28
+val appMinSdk = 28
 
 android {
     namespace = "net.bluemangoo.indpjsk"
@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         applicationId = "net.bluemangoo.indpjsk"
-        minSdk = minSdk
+        minSdk = appMinSdk
         targetSdk = 37
         versionCode = 1
         versionName = "1.1"
@@ -35,7 +35,29 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
+
+    sourceSets.getByName("main").assets.directories.add(
+        layout.buildDirectory.dir("generated/readme").get().asFile.absolutePath
+    )
+}
+
+val copyReadmeToAssets = tasks.register<Copy>("copyReadmeToAssets") {
+    group = "build"
+    description = "Pack README.md"
+    from(rootProject.file("README.md"))
+    into(layout.buildDirectory.dir("generated/readme").get().asFile)
+    rename { "README.md" }
+    inputs.file(rootProject.file("README.md")).withPropertyName("readme")
+    outputs.dir(layout.buildDirectory.dir("generated/readme")).withPropertyName("readmeAssets")
+}
+
+tasks.named("preBuild") {
+    dependsOn(copyReadmeToAssets)
+}
+tasks.matching { it.name.startsWith("merge") && it.name.contains("Assets") }.configureEach {
+    dependsOn(copyReadmeToAssets)
 }
 
 dependencies {
@@ -87,7 +109,6 @@ fun resolveNdkDirectory(project: Project): File {
         throw GradleException("Failed to find any installed NDK versions in ${ndkParentDir.absolutePath}")
     }
 
-    // 取最新安装的版本
     return installedVersions.last()
 }
 
@@ -117,19 +138,19 @@ val cargoBuildVpnCore = tasks.register<Exec>("cargoBuildVpnCore") {
             val execExt = if (OperatingSystem.current().isWindows) ".exe" else ""
 
             environment("NDK_HOME", ndkHomePath)
-            environment("PATH", "$ndkHomePath:${System.getenv("PATH")}")
+            environment("PATH", "${ndkBin.absolutePath}${File.pathSeparator}${System.getenv("PATH")}")
             environment(
                 "CC_aarch64-linux-android",
-                ndkBin.resolve("aarch64-linux-android$minSdk-clang$scriptExt").absolutePath
+                ndkBin.resolve("aarch64-linux-android$appMinSdk-clang$scriptExt").absolutePath
             )
             environment(
                 "CXX_aarch64-linux-android",
-                ndkBin.resolve("aarch64-linux-android$minSdk-clang++$scriptExt").absolutePath
+                ndkBin.resolve("aarch64-linux-android$appMinSdk-clang++$scriptExt").absolutePath
             )
             environment("AR_aarch64-linux-android", ndkBin.resolve("llvm-ar$execExt").absolutePath)
             environment(
                 "CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER",
-                ndkBin.resolve("aarch64-linux-android$minSdk-clang$scriptExt").absolutePath
+                ndkBin.resolve("aarch64-linux-android$appMinSdk-clang$scriptExt").absolutePath
             )
         } catch (e: Exception) {
             logger.warn("[cargoBuildVpnCore] resolveNdkDirectory failed: ${e.message}")