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
935fddcb
Commit
935fddcb
authored
Dec 28, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update submodule
parent
49458080
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
18 deletions
+22
-18
.gitmodules
.gitmodules
+3
-0
src/main/jni/Android.mk
src/main/jni/Android.mk
+18
-18
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-0
No files found.
.gitmodules
View file @
935fddcb
[submodule "src/main/jni/shadowsocks-libev"]
path = src/main/jni/shadowsocks-libev
url = https://github.com/shadowsocks/shadowsocks-libev
src/main/jni/Android.mk
View file @
935fddcb
...
@@ -61,8 +61,8 @@ SODIUM_SOURCE := $(crypto_aead_src) $(crypto_auth_src) $(crypto_box_src) \
...
@@ -61,8 +61,8 @@ SODIUM_SOURCE := $(crypto_aead_src) $(crypto_auth_src) $(crypto_box_src) \
$(crypto_stream_src)
$(crypto_verify_src)
$(randombytes_src)
$(sodium_src)
$(crypto_stream_src)
$(crypto_verify_src)
$(randombytes_src)
$(sodium_src)
LOCAL_MODULE
:=
sodium
LOCAL_MODULE
:=
sodium
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks/libsodium/src/libsodium/include
\
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libsodium/src/libsodium/include/sodium
\
-DPACKAGE_NAME
=
\"
libsodium
\"
-DPACKAGE_TARNAME
=
\"
libsodium
\"
\
-DPACKAGE_NAME
=
\"
libsodium
\"
-DPACKAGE_TARNAME
=
\"
libsodium
\"
\
-DPACKAGE_VERSION
=
\"
1.0.1
\"
-DPACKAGE_STRING
=
\"
libsodium
\
1.0.1
\"
\
-DPACKAGE_VERSION
=
\"
1.0.1
\"
-DPACKAGE_STRING
=
\"
libsodium
\
1.0.1
\"
\
-DPACKAGE_BUGREPORT
=
\"
https://github.com/jedisct1/libsodium/issues
\"
\
-DPACKAGE_BUGREPORT
=
\"
https://github.com/jedisct1/libsodium/issues
\"
\
...
@@ -79,7 +79,7 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include
...
@@ -79,7 +79,7 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks/libsodium/src/libsodium/include
-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/libsodium/src/libsodium/,
$(SODIUM_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks
-libev
/libsodium/src/libsodium/,
$(SODIUM_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -126,10 +126,10 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
...
@@ -126,10 +126,10 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
IPSET_SOURCE
:=
general.c
$(bdd_src)
$(map_src)
$(set_src)
IPSET_SOURCE
:=
general.c
$(bdd_src)
$(map_src)
$(set_src)
LOCAL_MODULE
:=
libipset
LOCAL_MODULE
:=
libipset
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks/libipset/include
\
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks/libcork/include
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libcork/include
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/libipset/,
$(IPSET_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks
-libev
/libipset/,
$(IPSET_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -153,10 +153,10 @@ pthreads_src := pthreads/thread.c
...
@@ -153,10 +153,10 @@ pthreads_src := pthreads/thread.c
CORK_SOURCE
:=
$(cli_src)
$(core_src)
$(ds_src)
$(posix_src)
$(pthreads_src)
CORK_SOURCE
:=
$(cli_src)
$(core_src)
$(ds_src)
$(posix_src)
$(pthreads_src)
LOCAL_MODULE
:=
libcork
LOCAL_MODULE
:=
libcork
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks/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/libcork/,
$(CORK_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks
-libev
/libcork/,
$(CORK_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
...
@@ -210,7 +210,7 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
...
@@ -210,7 +210,7 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
include
$(BUILD_EXECUTABLE)
include
$(BUILD_EXECUTABLE)
########################################################
########################################################
## shadowsocks local library
## shadowsocks
-libev
local library
########################################################
########################################################
include
$(CLEAR_VARS)
include
$(CLEAR_VARS)
...
@@ -218,15 +218,15 @@ include $(CLEAR_VARS)
...
@@ -218,15 +218,15 @@ include $(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c acl.c
SHADOWSOCKS_SOURCES
:=
local.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c acl.c
LOCAL_MODULE
:=
ss-local
LOCAL_MODULE
:=
ss-local
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks
-libev
/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/openssl/include
\
-I
$(LOCAL_PATH)
/openssl/include
\
-I
$(LOCAL_PATH)
/shadowsocks/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks/libipset/include
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libipset/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libipset libcork libsodium
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libipset libcork libsodium
...
@@ -235,7 +235,7 @@ LOCAL_LDLIBS := -llog
...
@@ -235,7 +235,7 @@ LOCAL_LDLIBS := -llog
include
$(BUILD_EXECUTABLE)
include
$(BUILD_EXECUTABLE)
########################################################
########################################################
## shadowsocks tunnel
## shadowsocks
-libev
tunnel
########################################################
########################################################
include
$(CLEAR_VARS)
include
$(CLEAR_VARS)
...
@@ -243,12 +243,12 @@ include $(CLEAR_VARS)
...
@@ -243,12 +243,12 @@ include $(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
SHADOWSOCKS_SOURCES
:=
tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
LOCAL_MODULE
:=
ss-tunnel
LOCAL_MODULE
:=
ss-tunnel
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks
-libev
/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/shadowsocks/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks
-libev
/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/openssl/include
-I
$(LOCAL_PATH)
/openssl/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libsodium
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libsodium
...
...
shadowsocks-libev
@
a772aba1
Subproject commit a772aba1f481e7bd39b70ebbe9db737155f6ca12
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