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
01c5e8bb
Commit
01c5e8bb
authored
Jan 18, 2017
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update submodules
parent
70e0b399
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
83 deletions
+42
-83
.gitignore
.gitignore
+3
-0
.gitmodules
.gitmodules
+9
-0
mobile/src/main/jni/Android.mk
mobile/src/main/jni/Android.mk
+26
-82
mobile/src/main/jni/libev
mobile/src/main/jni/libev
+1
-0
mobile/src/main/jni/libsodium
mobile/src/main/jni/libsodium
+1
-0
mobile/src/main/jni/libudns
mobile/src/main/jni/libudns
+1
-0
mobile/src/main/jni/shadowsocks-libev
mobile/src/main/jni/shadowsocks-libev
+1
-1
No files found.
.gitignore
View file @
01c5e8bb
...
@@ -6,3 +6,6 @@ local.sbt
...
@@ -6,3 +6,6 @@ local.sbt
#Intellij IDEA
#Intellij IDEA
.idea/
.idea/
.d
.d
mobile/src/main/libs
mobile/src/main/obj
.gitmodules
View file @
01c5e8bb
...
@@ -27,3 +27,12 @@
...
@@ -27,3 +27,12 @@
[submodule "mobile/src/main/jni/pcre"]
[submodule "mobile/src/main/jni/pcre"]
path = mobile/src/main/jni/pcre
path = mobile/src/main/jni/pcre
url = https://android.googlesource.com/platform/external/pcre
url = https://android.googlesource.com/platform/external/pcre
[submodule "mobile/src/main/jni/libsodium"]
path = mobile/src/main/jni/libsodium
url = https://github.com/shadowsocks/libsodium.git
[submodule "mobile/src/main/jni/libev"]
path = mobile/src/main/jni/libev
url = https://github.com/shadowsocks/libev.git
[submodule "mobile/src/main/jni/libudns"]
path = mobile/src/main/jni/libudns
url = https://github.com/shadowsocks/libudns.git
mobile/src/main/jni/Android.mk
View file @
01c5e8bb
...
@@ -84,7 +84,6 @@ SODIUM_SOURCE := \
...
@@ -84,7 +84,6 @@ SODIUM_SOURCE := \
crypto_secretbox/crypto_secretbox.c
\
crypto_secretbox/crypto_secretbox.c
\
crypto_secretbox/crypto_secretbox_easy.c
\
crypto_secretbox/crypto_secretbox_easy.c
\
crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c
\
crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c
\
crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c
\
crypto_shorthash/crypto_shorthash.c
\
crypto_shorthash/crypto_shorthash.c
\
crypto_shorthash/siphash24/shorthash_siphash24_api.c
\
crypto_shorthash/siphash24/shorthash_siphash24_api.c
\
crypto_shorthash/siphash24/ref/shorthash_siphash24.c
\
crypto_shorthash/siphash24/ref/shorthash_siphash24.c
\
...
@@ -92,58 +91,10 @@ SODIUM_SOURCE := \
...
@@ -92,58 +91,10 @@ SODIUM_SOURCE := \
crypto_sign/ed25519/ref10/base.h
\
crypto_sign/ed25519/ref10/base.h
\
crypto_sign/ed25519/ref10/base2.h
\
crypto_sign/ed25519/ref10/base2.h
\
crypto_sign/ed25519/sign_ed25519_api.c
\
crypto_sign/ed25519/sign_ed25519_api.c
\
crypto_sign/ed25519/ref10/d.h
\
crypto_sign/ed25519/ref10/d2.h
\
crypto_sign/ed25519/ref10/fe.h
\
crypto_sign/ed25519/ref10/fe_0.c
\
crypto_sign/ed25519/ref10/fe_1.c
\
crypto_sign/ed25519/ref10/fe_add.c
\
crypto_sign/ed25519/ref10/fe_cmov.c
\
crypto_sign/ed25519/ref10/fe_copy.c
\
crypto_sign/ed25519/ref10/fe_frombytes.c
\
crypto_sign/ed25519/ref10/fe_invert.c
\
crypto_sign/ed25519/ref10/fe_isnegative.c
\
crypto_sign/ed25519/ref10/fe_isnonzero.c
\
crypto_sign/ed25519/ref10/fe_mul.c
\
crypto_sign/ed25519/ref10/fe_neg.c
\
crypto_sign/ed25519/ref10/fe_pow22523.c
\
crypto_sign/ed25519/ref10/fe_sq.c
\
crypto_sign/ed25519/ref10/fe_sq2.c
\
crypto_sign/ed25519/ref10/fe_sub.c
\
crypto_sign/ed25519/ref10/fe_tobytes.c
\
crypto_sign/ed25519/ref10/ge.h
\
crypto_sign/ed25519/ref10/ge_add.c
\
crypto_sign/ed25519/ref10/ge_add.h
\
crypto_sign/ed25519/ref10/ge_double_scalarmult.c
\
crypto_sign/ed25519/ref10/ge_frombytes.c
\
crypto_sign/ed25519/ref10/ge_madd.c
\
crypto_sign/ed25519/ref10/ge_madd.h
\
crypto_sign/ed25519/ref10/ge_msub.c
\
crypto_sign/ed25519/ref10/ge_msub.h
\
crypto_sign/ed25519/ref10/ge_p1p1_to_p2.c
\
crypto_sign/ed25519/ref10/ge_p1p1_to_p3.c
\
crypto_sign/ed25519/ref10/ge_p2_0.c
\
crypto_sign/ed25519/ref10/ge_p2_dbl.c
\
crypto_sign/ed25519/ref10/ge_p2_dbl.h
\
crypto_sign/ed25519/ref10/ge_p3_0.c
\
crypto_sign/ed25519/ref10/ge_p3_dbl.c
\
crypto_sign/ed25519/ref10/ge_p3_to_cached.c
\
crypto_sign/ed25519/ref10/ge_p3_to_p2.c
\
crypto_sign/ed25519/ref10/ge_p3_tobytes.c
\
crypto_sign/ed25519/ref10/ge_precomp_0.c
\
crypto_sign/ed25519/ref10/ge_scalarmult_base.c
\
crypto_sign/ed25519/ref10/ge_sub.c
\
crypto_sign/ed25519/ref10/ge_sub.h
\
crypto_sign/ed25519/ref10/ge_tobytes.c
\
crypto_sign/ed25519/ref10/keypair.c
\
crypto_sign/ed25519/ref10/keypair.c
\
crypto_sign/ed25519/ref10/open.c
\
crypto_sign/ed25519/ref10/open.c
\
crypto_sign/ed25519/ref10/pow22523.h
\
crypto_sign/ed25519/ref10/obsolete.c
\
crypto_sign/ed25519/ref10/pow225521.h
\
crypto_sign/ed25519/ref10/sc.h
\
crypto_sign/ed25519/ref10/sc_muladd.c
\
crypto_sign/ed25519/ref10/sc_reduce.c
\
crypto_sign/ed25519/ref10/sign.c
\
crypto_sign/ed25519/ref10/sign.c
\
crypto_sign/ed25519/ref10/sqrtm1.h
\
crypto_stream/crypto_stream.c
\
crypto_stream/crypto_stream.c
\
crypto_stream/chacha20/stream_chacha20.c
\
crypto_stream/chacha20/stream_chacha20.c
\
crypto_stream/chacha20/stream_chacha20.h
\
crypto_stream/chacha20/stream_chacha20.h
\
...
@@ -166,23 +117,16 @@ SODIUM_SOURCE := \
...
@@ -166,23 +117,16 @@ SODIUM_SOURCE := \
sodium/version.c
sodium/version.c
SODIUM_SOURCE
+=
\
SODIUM_SOURCE
+=
\
crypto_scalarmult/curve25519/ref10/curve25519_ref10.c
\
crypto_scalarmult/curve25519/ref10/x25519_ref10.c
crypto_scalarmult/curve25519/ref10/curve25519_ref10.h
\
crypto_scalarmult/curve25519/ref10/fe.h
\
SODIUM_SOURCE
+=
\
crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c
\
crypto_pwhash/argon2/argon2-core.c
\
crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c
\
crypto_pwhash/argon2/argon2.c
\
crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c
\
crypto_pwhash/argon2/argon2-encoding.c
\
crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c
\
crypto_pwhash/argon2/blake2b-long.c
\
crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c
\
crypto_pwhash/argon2/argon2-fill-block-ref.c
\
crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c
\
crypto_pwhash/argon2/pwhash_argon2i.c
\
crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c
\
crypto_pwhash/argon2/argon2-fill-block-ssse3.c
crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c
\
crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c
\
crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c
\
crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c
\
crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c
\
crypto_scalarmult/curve25519/ref10/montgomery.h
\
crypto_scalarmult/curve25519/ref10/pow225521.h
SODIUM_SOURCE
+=
\
SODIUM_SOURCE
+=
\
crypto_stream/salsa20/ref/stream_salsa20_ref.c
\
crypto_stream/salsa20/ref/stream_salsa20_ref.c
\
...
@@ -192,10 +136,10 @@ SODIUM_SOURCE += \
...
@@ -192,10 +136,10 @@ SODIUM_SOURCE += \
randombytes/sysrandom/randombytes_sysrandom.c
randombytes/sysrandom/randombytes_sysrandom.c
LOCAL_MODULE
:=
sodium
LOCAL_MODULE
:=
sodium
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libsodium/src/libsodium/include
\
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/include/sodium
\
-I
$(LOCAL_PATH)
/include/sodium
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include/sodium
\
-DPACKAGE_NAME
=
\"
libsodium
\"
-DPACKAGE_TARNAME
=
\"
libsodium
\"
\
-DPACKAGE_NAME
=
\"
libsodium
\"
-DPACKAGE_TARNAME
=
\"
libsodium
\"
\
-DPACKAGE_VERSION
=
\"
1.0.7
\"
-DPACKAGE_STRING
=
\"
libsodium
\
1.0.7
\"
\
-DPACKAGE_VERSION
=
\"
1.0.7
\"
-DPACKAGE_STRING
=
\"
libsodium
\
1.0.7
\"
\
-DPACKAGE_BUGREPORT
=
\"
https://github.com/jedisct1/libsodium/issues
\"
\
-DPACKAGE_BUGREPORT
=
\"
https://github.com/jedisct1/libsodium/issues
\"
\
...
@@ -211,7 +155,7 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/in
...
@@ -211,7 +155,7 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/in
-DHAVE_WEAK_SYMBOLS
=
1
-DHAVE_ARC4RANDOM
=
1
-DHAVE_ARC4RANDOM_BUF
=
1
\
-DHAVE_WEAK_SYMBOLS
=
1
-DHAVE_ARC4RANDOM
=
1
-DHAVE_ARC4RANDOM_BUF
=
1
\
-DHAVE_MLOCK
=
1
-DHAVE_MPROTECT
=
1
-DHAVE_POSIX_MEMALIGN
=
1
-DHAVE_MLOCK
=
1
-DHAVE_MPROTECT
=
1
-DHAVE_POSIX_MEMALIGN
=
1
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/
libsodium/src/libsodium/,
$(SODIUM_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
libsodium/src/libsodium/,
$(SODIUM_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -275,7 +219,7 @@ LOCAL_MODULE := libipset
...
@@ -275,7 +219,7 @@ LOCAL_MODULE := libipset
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libipset/,
$(IPSET_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libipset/
src/libipset/
,
$(IPSET_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -302,7 +246,7 @@ LOCAL_MODULE := libcork
...
@@ -302,7 +246,7 @@ LOCAL_MODULE := libcork
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-DCORK_API
=
CORK_LOCAL
-DCORK_API
=
CORK_LOCAL
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libcork/,
$(CORK_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libcork/
src/libcork/
,
$(CORK_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -318,10 +262,10 @@ UDNS_SOURCES := udns_dn.c udns_dntosp.c udns_parse.c udns_resolver.c udns_init.c
...
@@ -318,10 +262,10 @@ UDNS_SOURCES := udns_dn.c udns_dntosp.c udns_parse.c udns_resolver.c udns_init.c
udns_rr_srv.c udns_rr_naptr.c udns_codes.c udns_jran.c
udns_rr_srv.c udns_rr_naptr.c udns_codes.c udns_jran.c
LOCAL_MODULE
:=
libudns
LOCAL_MODULE
:=
libudns
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libudns
\
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/libudns
\
-DHAVE_DECL_INET_NTOP
-DHAVE_DECL_INET_NTOP
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/
libudns/,
$(UDNS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
libudns/,
$(UDNS_SOURCES)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -335,8 +279,8 @@ LOCAL_MODULE := libev
...
@@ -335,8 +279,8 @@ LOCAL_MODULE := libev
LOCAL_CFLAGS
+=
-O2
-DNDEBUG
-DHAVE_CONFIG_H
\
LOCAL_CFLAGS
+=
-O2
-DNDEBUG
-DHAVE_CONFIG_H
\
-I
$(LOCAL_PATH)
/include/libev
-I
$(LOCAL_PATH)
/include/libev
LOCAL_SRC_FILES
:=
\
LOCAL_SRC_FILES
:=
\
shadowsocks-libev/
libev/ev.c
\
libev/ev.c
\
shadowsocks-libev/
libev/event.c
libev/event.c
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -400,10 +344,10 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
...
@@ -400,10 +344,10 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/pcre
\
-I
$(LOCAL_PATH)
/pcre
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libudns
\
-I
$(LOCAL_PATH)
/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libev
-I
$(LOCAL_PATH)
/shadowsocks-libev/libev
...
@@ -429,10 +373,10 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
...
@@ -429,10 +373,10 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
-DCONNECT_IN_PROGRESS
=
EINPROGRESS
\
-DCONNECT_IN_PROGRESS
=
EINPROGRESS
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libudns
\
-I
$(LOCAL_PATH)
/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/libsodium/src/
libsodium/include
\
-I
$(LOCAL_PATH)
/libsodium/include
\
-I
$(LOCAL_PATH)
/
shadowsocks-libev/
libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libev
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libev
\
-I
$(LOCAL_PATH)
/include/shadowsocks-libev
-I
$(LOCAL_PATH)
/include/shadowsocks-libev
...
...
libev
@
981fb847
Subproject commit 981fb847e1e306bc40460de4a810f63f9bbc7212
libsodium
@
a81cea23
Subproject commit a81cea2366b9e814861a6f47e5bd460e06f19295
libudns
@
53a1abd2
Subproject commit 53a1abd2b6fd7e3bf99ce6e2e267c636618d57ef
shadowsocks-libev
@
19e222ba
Subproject commit
45529cdf7a3cd5384d58f97ec0e4c62de55cdae0
Subproject commit
19e222bad8416f20b7694bff75f2cee72a70701e
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