Unverified Commit 4f38bedc authored by Max Lv's avatar Max Lv Committed by GitHub

Update shadowsocks-rust to 1.9.0 (#2622)

parent 1bb482eb
......@@ -7,6 +7,9 @@ jobs:
environment:
GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process"
steps:
- run: rustup toolchain install nightly-2020-12-20
- run: rustup override set nightly-2020-12-20
- run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
- checkout
- run: git submodule update --init --recursive
- restore_cache:
......
......@@ -19,7 +19,12 @@ for Android TV ([beta](https://play.google.com/apps/testing/com.github.shadowsoc
* Android SDK
- Android NDK
* Rust with Android targets installed
`$ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android`
```bash
$ rustup toolchain install nightly-2020-12-20
$ rustup override set nightly-2020-12-20
$ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
```
### BUILD
......
......@@ -56,8 +56,8 @@ fun Project.setupCore() {
setupCommon()
android.apply {
defaultConfig {
versionCode = 5010750
versionName = "5.1.7-nightly"
versionCode = 5010850
versionName = "5.1.8-nightly"
}
compileOptions.isCoreLibraryDesugaringEnabled = true
lintOptions {
......
......@@ -38,16 +38,9 @@ cargo {
profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor
extraCargoBuildArguments = listOf("--bin", libname!!)
featureSpec.noDefaultBut(arrayOf(
"ring-aead-ciphers",
"sodium",
"rc4",
"aes-cfb",
"aes-ctr",
"camellia-cfb",
"openssl-vendored",
"single-threaded",
"local-flow-stat",
"local-dns-relay"))
"local-dns"))
exec = { spec, toolchain ->
spec.environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY", "$projectDir/$module/../linker-wrapper.py")
spec.environment("RUST_ANDROID_GRADLE_TARGET", "target/${toolchain.target}/$profile/lib$libname.so")
......
......@@ -90,8 +90,8 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
throw BaseService.ExpectedExceptionWrapper(e)
}.let { dns ->
cmd += arrayListOf(
"--dns-relay", "${DataStore.listenAddress}:${DataStore.portLocalDns}",
"--remote-dns", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}")
"--dns-addr", "${DataStore.listenAddress}:${DataStore.portLocalDns}",
"--remote-dns-addr", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}")
}
if (route != Acl.ALL) {
......
Subproject commit 2a6451f0feef2abbcf961be38edf13abdada11b5
Subproject commit 3a1054acc54cfc23a1cd232aa0a45b66af4bd612
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