From a2f3330455fcf01e8b0370cf720ce030751686f8 Mon Sep 17 00:00:00 2001
From: kr328 <kr328app@outlook.com>
Date: Sat, 22 May 2021 19:53:28 +0800
Subject: [PATCH] Fix: force use cmake installed in system

---
 .../github/kr328/clash/tools/ClashBuildPlugin.kt | 16 ----------------
 .../github/kr328/clash/tools/ClashBuildTask.kt   |  5 +----
 .../com/github/kr328/clash/tools/Environment.kt  |  4 ----
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt
index b6c8c5db..436d381c 100644
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt
@@ -3,18 +3,13 @@ package com.github.kr328.clash.tools
 import com.android.build.gradle.LibraryExtension
 import golangBuild
 import golangSource
-import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.Delete
-import java.io.File
 import java.util.*
 
 class ClashBuildPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         target.afterEvaluate {
-            val cmakeDirectory = resolveCmakeDir(target)
-
             target.extensions.getByType(LibraryExtension::class.java).apply {
                 libraryVariants.forEach { variant ->
                     val config = BuildConfig.of(this, variant)
@@ -27,7 +22,6 @@ class ClashBuildPlugin : Plugin<Project> {
                     ) {
                         it.config.set(config)
                         it.ndkDirectory.set(ndkDirectory)
-                        it.cmakeDirectory.set(cmakeDirectory)
                         it.inputDirectory.set(target.golangSource)
                         it.outputDirectory.set(buildDir)
                     }
@@ -48,14 +42,4 @@ class ClashBuildPlugin : Plugin<Project> {
             }
         }
     }
-
-    private fun resolveCmakeDir(project: Project): File {
-        val properties = Properties().apply {
-            project.rootProject.file("local.properties").inputStream().use(this::load)
-        }
-
-        return project.rootProject.file(
-            properties.getProperty("cmake.dir") ?: throw GradleException("cmake.dir not found")
-        )
-    }
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt
index d11a5ea1..01baa3c7 100644
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt
@@ -16,9 +16,6 @@ abstract class ClashBuildTask : DefaultTask() {
     abstract val ndkDirectory: DirectoryProperty
         @InputDirectory get
 
-    abstract val cmakeDirectory: DirectoryProperty
-        @InputDirectory get
-
     abstract val inputDirectory: DirectoryProperty
         @InputDirectory get
 
@@ -31,7 +28,7 @@ abstract class ClashBuildTask : DefaultTask() {
         val output = outputDirectory.file
 
         val config = config.get()
-        val environment = Environment(ndkDirectory.file, cmakeDirectory.file, config.minSdkVersion)
+        val environment = Environment(ndkDirectory.file, config.minSdkVersion)
 
         val tags = listOf("without_gvisor", "without_system") +
                 (if (config.debug) listOf("debug") else emptyList()) +
diff --git a/buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt b/buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt
index 0403bf36..2bee8c01 100644
--- a/buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt
+++ b/buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt
@@ -6,7 +6,6 @@ import java.io.File
 
 class Environment(
     private val ndkDirectory: File,
-    private val cmakeDirectory: File,
     private val minSdkVersion: Int,
 ) {
     fun ofCoreBuild(abi: NativeAbi): Map<String, String> {
@@ -35,10 +34,7 @@ class Environment(
     }
 
     fun ofLwipBuild(abi: NativeAbi): Map<String, String> {
-        val path = "${cmakeDirectory.absolutePath}${File.pathSeparator}${System.getenv("PATH")}"
-
         return mapOf(
-            "PATH" to path,
             "CMAKE_SYSTEM_NAME" to "Android",
             "CMAKE_ANDROID_NDK" to ndkDirectory.absolutePath,
             "CMAKE_ANDROID_ARCH_ABI" to abi.value,