Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
4f38bedc
Unverified
Commit
4f38bedc
authored
Dec 25, 2020
by
Max Lv
Committed by
GitHub
Dec 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update shadowsocks-rust to 1.9.0 (#2622)
parent
1bb482eb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
14 deletions
+15
-14
.circleci/config.yml
.circleci/config.yml
+3
-0
README.md
README.md
+6
-1
buildSrc/src/main/kotlin/Helpers.kt
buildSrc/src/main/kotlin/Helpers.kt
+2
-2
core/build.gradle.kts
core/build.gradle.kts
+1
-8
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
.../src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
+2
-2
core/src/main/rust/shadowsocks-rust
core/src/main/rust/shadowsocks-rust
+1
-1
No files found.
.circleci/config.yml
View file @
4f38bedc
...
...
@@ -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
:
...
...
README.md
View file @
4f38bedc
...
...
@@ -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
...
...
buildSrc/src/main/kotlin/Helpers.kt
View file @
4f38bedc
...
...
@@ -56,8 +56,8 @@ fun Project.setupCore() {
setupCommon
()
android
.
apply
{
defaultConfig
{
versionCode
=
5010
7
50
versionName
=
"5.1.
7
-nightly"
versionCode
=
5010
8
50
versionName
=
"5.1.
8
-nightly"
}
compileOptions
.
isCoreLibraryDesugaringEnabled
=
true
lintOptions
{
...
...
core/build.gradle.kts
View file @
4f38bedc
...
...
@@ -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"
)
...
...
core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
View file @
4f38bedc
...
...
@@ -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
)
{
...
...
shadowsocks-rust
@
3a1054ac
Subproject commit
2a6451f0feef2abbcf961be38edf13abdada11b5
Subproject commit
3a1054acc54cfc23a1cd232aa0a45b66af4bd612
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment