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
cd72a670
Commit
cd72a670
authored
Jan 29, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Purge overture
parent
add3aa4f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
6 additions
and
65 deletions
+6
-65
.gitmodules
.gitmodules
+0
-4
README.md
README.md
+0
-1
core/build.gradle
core/build.gradle
+0
-17
core/go-build.bash
core/go-build.bash
+0
-30
core/src/main/assets/overture/domain_exceptions.acl
core/src/main/assets/overture/domain_exceptions.acl
+0
-1
core/src/main/assets/overture/hosts
core/src/main/assets/overture/hosts
+0
-1
core/src/main/java/com/github/shadowsocks/Core.kt
core/src/main/java/com/github/shadowsocks/Core.kt
+6
-7
core/src/main/jni/overture
core/src/main/jni/overture
+0
-1
mobile/build.gradle
mobile/build.gradle
+0
-1
mobile/src/main/res/raw/about.html
mobile/src/main/res/raw/about.html
+0
-1
tv/build.gradle
tv/build.gradle
+0
-1
No files found.
.gitmodules
View file @
cd72a670
...
...
@@ -30,7 +30,3 @@
[submodule "core/src/main/jni/libev"]
path = core/src/main/jni/libev
url = https://github.com/shadowsocks/libev.git
[submodule "core/src/main/jni/overture"]
path = core/src/main/jni/overture
url = https://github.com/shadowsocks/overture.git
branch = shadowsocks
README.md
View file @
cd72a670
...
...
@@ -47,7 +47,6 @@ docker run --rm -v ${PWD}/build:/build shadowsocks/android-ndk-go bash -c "cd /b
<li>
pcre:
<a
href=
"https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE"
>
BSD
</a></li>
<li>
libancillary:
<a
href=
"https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING"
>
BSD
</a></li>
<li>
shadowsocks-libev:
<a
href=
"https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE"
>
GPLv3
</a></li>
<li>
overture:
<a
href=
"https://github.com/shawn1m/overture/blob/master/LICENSE"
>
MIT
</a></li>
<li>
libev:
<a
href=
"https://github.com/shadowsocks/libev/blob/master/LICENSE"
>
GPLv2
</a></li>
<li>
libsodium:
<a
href=
"https://github.com/jedisct1/libsodium/blob/master/LICENSE"
>
ISC
</a></li>
</ul>
...
...
core/build.gradle
View file @
cd72a670
...
...
@@ -40,23 +40,6 @@ android {
}
}
task
goBuild
(
type:
Exec
)
{
if
(
Os
.
isFamily
(
Os
.
FAMILY_WINDOWS
))
{
println
"Warning: Building on Windows is not supported"
}
else
{
executable
"/bin/bash"
args
"go-build.bash"
,
minSdkVersion
environment
"ANDROID_HOME"
,
android
.
sdkDirectory
environment
"ANDROID_NDK_HOME"
,
android
.
ndkDirectory
}
}
tasks
.
whenTaskAdded
{
task
->
if
((
task
.
name
==
'generateJsonModelDebug'
||
task
.
name
==
'generateJsonModelRelease'
))
{
task
.
dependsOn
(
goBuild
)
}
}
dependencies
{
api
project
(
':plugin'
)
api
"android.arch.work:work-runtime-ktx:$workVersion"
...
...
core/go-build.bash
deleted
100755 → 0
View file @
add3aa4f
#!/bin/bash
[[
-z
"
${
ANDROID_NDK_HOME
}
"
]]
&&
ANDROID_NDK_HOME
=
"
${
ANDROID_HOME
}
/ndk-bundle"
TOOLCHAIN
=
"
$(
find
${
ANDROID_NDK_HOME
}
/toolchains/llvm/prebuilt/
*
-maxdepth
1
-type
d
-print
-quit
)
/bin"
ABIS
=(
armeabi-v7a arm64-v8a x86 x86_64
)
GO_ARCHS
=(
'arm GOARM=7'
arm64 386 amd64
)
CLANG_ARCHS
=(
armv7a-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
)
STRIP_ARCHS
=(
arm-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
)
MIN_API
=
"
$1
"
ROOT
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
OUT_DIR
=
"
$ROOT
/build/go"
cd
"
$ROOT
/src/main/jni/overture/main"
BIN
=
"liboverture.so"
for
i
in
"
${
!ABIS[@]
}
"
;
do
ABI
=
"
${
ABIS
[
$i
]
}
"
[[
-f
"
${
OUT_DIR
}
/
${
ABI
}
/
${
BIN
}
"
]]
&&
continue
echo
"Build
${
BIN
}
${
ABI
}
"
mkdir
-p
${
OUT_DIR
}
/
${
ABI
}
\
&&
env
\
CGO_ENABLED
=
1
CC
=
"
${
TOOLCHAIN
}
/
${
CLANG_ARCHS
[
$i
]
}${
MIN_API
}
-clang"
\
GOOS
=
android
GOARCH
=
${
GO_ARCHS
[
$i
]
}
\
go build
-v
-ldflags
=
'-s -w'
-o
"
${
OUT_DIR
}
/unstripped"
\
&&
"
${
TOOLCHAIN
}
/
${
STRIP_ARCHS
[
$i
]
}
-strip"
"
${
OUT_DIR
}
/unstripped"
-o
"
${
OUT_DIR
}
/
${
ABI
}
/
${
BIN
}
"
\
||
exit
-1
rm
"
${
OUT_DIR
}
/unstripped"
done
cd
"
$ROOT
"
core/src/main/assets/overture/domain_exceptions.acl
deleted
100644 → 0
View file @
add3aa4f
(^|\.)googleapis(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?){1,2}$
core/src/main/assets/overture/hosts
deleted
100644 → 0
View file @
add3aa4f
127.0.0.1 localhost
core/src/main/java/com/github/shadowsocks/Core.kt
View file @
cd72a670
...
...
@@ -107,14 +107,13 @@ object Core {
if
(
DataStore
.
tcpFastOpen
&&
!
TcpFastOpen
.
sendEnabled
)
TcpFastOpen
.
enableTimeout
()
if
(
DataStore
.
publicStore
.
getLong
(
Key
.
assetUpdateTime
,
-
1
)
!=
packageInfo
.
lastUpdateTime
)
{
val
assetManager
=
app
.
assets
for
(
dir
in
arrayOf
(
"acl"
,
"overture"
))
try
{
for
(
file
in
assetManager
.
list
(
dir
)
!!
)
assetManager
.
open
(
"$dir/$file"
).
use
{
input
->
File
(
deviceStorage
.
noBackupFilesDir
,
file
).
outputStream
().
use
{
output
->
input
.
copyTo
(
output
)
}
}
}
catch
(
e
:
IOException
)
{
printLog
(
e
)
try
{
for
(
file
in
assetManager
.
list
(
"acl"
)
!!
)
assetManager
.
open
(
"acl/$file"
).
use
{
input
->
File
(
deviceStorage
.
noBackupFilesDir
,
file
).
outputStream
().
use
{
output
->
input
.
copyTo
(
output
)
}
}
}
catch
(
e
:
IOException
)
{
printLog
(
e
)
}
DataStore
.
publicStore
.
putLong
(
Key
.
assetUpdateTime
,
packageInfo
.
lastUpdateTime
)
}
updateNotificationChannels
()
...
...
overture
@
6d1e1854
Subproject commit 6d1e18544504c41600d9d682aa980eaa24448558
mobile/build.gradle
View file @
cd72a670
...
...
@@ -47,7 +47,6 @@ android {
}
sourceSets
.
main
.
jniLibs
.
srcDirs
+=
new
File
(
project
(
':core'
).
buildDir
,
"intermediates/bundles/${getCurrentFlavor()}/jni"
)
sourceSets
.
main
.
jniLibs
.
srcDirs
+=
new
File
(
project
(
':core'
).
projectDir
,
"build/go"
)
}
dependencies
{
...
...
mobile/src/main/res/raw/about.html
View file @
cd72a670
...
...
@@ -26,7 +26,6 @@
<li>
pcre:
<a
href=
"https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE"
>
BSD
</a>
</li>
<li>
libancillary:
<a
href=
"https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING"
>
BSD
</a>
</li>
<li>
shadowsocks-libev:
<a
href=
"https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE"
>
GPLv3
</a>
</li>
<li>
overture:
<a
href=
"https://github.com/shawn1m/overture/blob/master/LICENSE"
>
MIT
</a>
</li>
<li>
libev:
<a
href=
"https://github.com/shadowsocks/libev/blob/master/LICENSE"
>
GPLv2
</a>
</li>
<li>
libsodium:
<a
href=
"https://github.com/jedisct1/libsodium/blob/master/LICENSE"
>
ISC
</a>
</li>
</ul>
...
...
tv/build.gradle
View file @
cd72a670
...
...
@@ -47,7 +47,6 @@ android {
}
sourceSets
.
main
.
jniLibs
.
srcDirs
+=
new
File
(
project
(
':core'
).
buildDir
,
"intermediates/bundles/${getCurrentFlavor()}/jni"
)
sourceSets
.
main
.
jniLibs
.
srcDirs
+=
new
File
(
project
(
':core'
).
projectDir
,
"build/go"
)
}
dependencies
{
...
...
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