Commit c5ce702d authored by Mygod's avatar Mygod

Update dependencies

parent 466fc7bb
...@@ -18,7 +18,8 @@ for Android TV ([beta](https://play.google.com/apps/testing/com.github.shadowsoc ...@@ -18,7 +18,8 @@ for Android TV ([beta](https://play.google.com/apps/testing/com.github.shadowsoc
* JDK 1.8 * JDK 1.8
* Android SDK * Android SDK
- Android NDK - Android NDK
* Rust with targets `armv7-linux-androideabi`, `aarch64-linux-android`, `i686-linux-android`, `x86_64-linux-android` * Rust with Android targets installed
`$ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android`
### BUILD ### BUILD
......
...@@ -17,7 +17,7 @@ buildscript { ...@@ -17,7 +17,7 @@ buildscript {
classpath(rootProject.extra.get("androidPlugin").toString()) classpath(rootProject.extra.get("androidPlugin").toString())
classpath(kotlin("gradle-plugin", rootProject.extra.get("kotlinVersion").toString())) classpath(kotlin("gradle-plugin", rootProject.extra.get("kotlinVersion").toString()))
classpath("com.google.android.gms:oss-licenses-plugin:0.10.2") classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta04") classpath("com.google.firebase:firebase-crashlytics-gradle:2.0.0")
classpath("com.google.gms:google-services:4.3.3") classpath("com.google.gms:google-services:4.3.3")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.11.1") classpath("com.vanniktech:gradle-maven-publish-plugin:0.11.1")
classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3") classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3")
...@@ -28,6 +28,6 @@ allprojects { ...@@ -28,6 +28,6 @@ allprojects {
apply(from = "${rootProject.projectDir}/repositories.gradle.kts") apply(from = "${rootProject.projectDir}/repositories.gradle.kts")
} }
tasks.register("clean", Delete::class) { tasks.register<Delete>("clean") {
delete(rootProject.buildDir) delete(rootProject.buildDir)
} }
...@@ -39,19 +39,16 @@ cargo { ...@@ -39,19 +39,16 @@ cargo {
libname = "sslocal" libname = "sslocal"
targets = listOf("arm", "arm64", "x86", "x86_64") targets = listOf("arm", "arm64", "x86", "x86_64")
profile = findProperty("CARGO_PROFILE")?.toString() ?: "release" profile = findProperty("CARGO_PROFILE")?.toString() ?: "release"
targetIncludes = arrayOf("lib$libname.so") extraCargoBuildArguments = listOf("--bin", libname!!)
extraCargoBuildArguments = listOf("--bin", "sslocal") featureSpec.noDefaultBut(arrayOf(
features { "sodium",
noDefaultBut(arrayOf( "rc4",
"sodium", "aes-cfb",
"rc4", "aes-ctr",
"aes-cfb", "camellia-cfb",
"aes-ctr", "openssl-vendored",
"camellia-cfb", "local-flow-stat",
"openssl-vendored", "local-dns-relay"))
"local-flow-stat",
"local-dns-relay"))
}
exec = { spec, toolchain -> exec = { spec, toolchain ->
spec.environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-o,target/${toolchain.target}/$profile/lib$libname.so") spec.environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-o,target/${toolchain.target}/$profile/lib$libname.so")
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment