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
833b35e7
Commit
833b35e7
authored
May 04, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix output name second attempt
parent
c5ce702d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
5 deletions
+24
-5
.gitmodules
.gitmodules
+1
-1
core/build.gradle.kts
core/build.gradle.kts
+2
-1
core/src/main/rust/linker-wrapper.py
core/src/main/rust/linker-wrapper.py
+18
-0
core/src/main/rust/shadowsocks-rust
core/src/main/rust/shadowsocks-rust
+1
-1
mobile/build.gradle.kts
mobile/build.gradle.kts
+1
-1
repositories.gradle.kts
repositories.gradle.kts
+1
-1
No files found.
.gitmodules
View file @
833b35e7
...
...
@@ -16,4 +16,4 @@
branch = shadowsocks-android
[submodule "core/src/main/rust/shadowsocks-rust"]
path = core/src/main/rust/shadowsocks-rust
url = https://github.com/
madeye/shadowsocks-rus
t
url = https://github.com/
shadowsocks/shadowsocks-rust.gi
t
core/build.gradle.kts
View file @
833b35e7
...
...
@@ -50,7 +50,8 @@ cargo {
"local-flow-stat"
,
"local-dns-relay"
))
exec
=
{
spec
,
toolchain
->
spec
.
environment
(
"RUST_ANDROID_GRADLE_CC_LINK_ARG"
,
"-o,target/${toolchain.target}/$profile/lib$libname.so"
)
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/rust/linker-wrapper.py
0 → 100755
View file @
833b35e7
from
__future__
import
absolute_import
,
print_function
,
unicode_literals
import
os
import
pipes
import
shutil
import
subprocess
import
sys
args
=
[
os
.
environ
[
'RUST_ANDROID_GRADLE_CC'
],
os
.
environ
[
'RUST_ANDROID_GRADLE_CC_LINK_ARG'
]]
+
sys
.
argv
[
1
:]
# This only appears when the subprocess call fails, but it's helpful then.
printable_cmd
=
' '
.
join
(
pipes
.
quote
(
arg
)
for
arg
in
args
)
print
(
printable_cmd
)
code
=
subprocess
.
call
(
args
)
if
code
==
0
:
shutil
.
copyfile
(
sys
.
argv
[
sys
.
argv
.
index
(
'-o'
)
+
1
],
os
.
environ
[
'RUST_ANDROID_GRADLE_TARGET'
])
sys
.
exit
(
code
)
shadowsocks-rust
@
45a34698
Subproject commit
246b6c48bce6d4a83af046bd3feb4843f772b9d
2
Subproject commit
45a3469840fa423cecec90de5cc03ed5003c1a9
2
mobile/build.gradle.kts
View file @
833b35e7
...
...
@@ -21,6 +21,6 @@ dependencies {
implementation
(
"com.google.zxing:core:3.4.0"
)
implementation
(
"com.takisoft.preferencex:preferencex-simplemenu:1.1.0"
)
implementation
(
"com.twofortyfouram:android-plugin-api-for-locale:1.0.4"
)
implementation
(
"me.zhanghai.android.fastscroll:library:1.1.
2
"
)
implementation
(
"me.zhanghai.android.fastscroll:library:1.1.
3
"
)
implementation
(
"xyz.belvi.mobilevision:barcodescanner:2.0.3"
)
}
repositories.gradle.kts
View file @
833b35e7
rootProject
.
extra
.
apply
{
set
(
"androidPlugin"
,
"com.android.tools.build:gradle:4.1.0-alpha0
7
"
)
set
(
"androidPlugin"
,
"com.android.tools.build:gradle:4.1.0-alpha0
8
"
)
set
(
"kotlinVersion"
,
"1.3.72"
)
}
...
...
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