Kr328/ClashForAndroid
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #413 from goomadao/fix-gradle

Browse Source 
Fix build on macOS and Windows
This commit is contained in:
Kr328 authored and GitHub committed 2020-06-12 19:06:10 +08:00
2 parents 514c84ec7e 728cc0d10b
commit a0b5e595c8
1 file changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files
core/clash.gradle.kts
+12 -12
View File
@@ -37,39 +37,39 @@ fun generateGolangBuildEnvironment(abi: String): Map<String, String> {
val cCompiler = when(abi) {
"armeabi-v7a" ->
"armv7a-$host-androideabi$gMinSdkVersion-clang"
"armv7a-linux-androideabi$gMinSdkVersion-clang"
"arm64-v8a" ->
"aarch64-$host-android$gMinSdkVersion-clang"
"aarch64-linux-android$gMinSdkVersion-clang"
"x86" ->
"i686-$host-android$gMinSdkVersion-clang"
"i686-linux-android$gMinSdkVersion-clang"
"x86_64" ->
"x86_64-$host-android$gMinSdkVersion-clang"
"x86_64-linux-android$gMinSdkVersion-clang"
else ->
throw GradleScriptException("Unsupported abi $abi", FileNotFoundException("Unsupported abi $abi"))
}
val cppCompiler = when(abi) {
"armeabi-v7a" ->
"armv7a-$host-androideabi$gMinSdkVersion-clang++"
"armv7a-linux-androideabi$gMinSdkVersion-clang++"
"arm64-v8a" ->
"aarch64-$host-android$gMinSdkVersion-clang++"
"aarch64-linux-android$gMinSdkVersion-clang++"
"x86" ->
"i686-$host-android$gMinSdkVersion-clang++"
"i686-linux-android$gMinSdkVersion-clang++"
"x86_64" ->
"x86_64-$host-android$gMinSdkVersion-clang++"
"x86_64-linux-android$gMinSdkVersion-clang++"
else ->
throw GradleScriptException("Unsupported abi $abi", FileNotFoundException("Unsupported abi $abi"))
}
val linker = when(abi) {
"armeabi-v7a" ->
"arm-$host-androideabi-ld"
"arm-linux-androideabi-ld"
"arm64-v8a" ->
"aarch64-$host-android-ld"
"aarch64-linux-android-ld"
"x86" ->
"i686-$host-android-ld"
"i686-linux-android-ld"
"x86_64" ->
"x86_64-$host-android-ld"
"x86_64-linux-android-ld"
else ->
throw GradleScriptException("Unsupported abi $abi", FileNotFoundException("Unsupported abi $abi"))
}