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
103dc10a
Commit
103dc10a
authored
Feb 17, 2017
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update shadowsocks-libev
parent
36c94b8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
7 deletions
+25
-7
mobile/src/main/jni/Android.mk
mobile/src/main/jni/Android.mk
+24
-6
mobile/src/main/jni/shadowsocks-libev
mobile/src/main/jni/shadowsocks-libev
+1
-1
No files found.
mobile/src/main/jni/Android.mk
View file @
103dc10a
...
@@ -117,6 +117,22 @@ LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE))
...
@@ -117,6 +117,22 @@ LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE))
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
########################################################
## libbloom
########################################################
include
$(CLEAR_VARS)
BLOOM_SOURCE
:=
bloom.c murmur2/MurmurHash2.c
LOCAL_MODULE
:=
libbloom
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks-libev/libbloom
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libbloom/murmur2
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libbloom/,
$(BLOOM_SOURCE)
)
include
$(BUILD_STATIC_LIBRARY)
########################################################
########################################################
## libipset
## libipset
########################################################
########################################################
...
@@ -250,7 +266,7 @@ SHADOWSOCKS_SOURCES := local.c \
...
@@ -250,7 +266,7 @@ SHADOWSOCKS_SOURCES := local.c \
cache.c udprelay.c utils.c netutils.c json.c jconf.c
\
cache.c udprelay.c utils.c netutils.c json.c jconf.c
\
acl.c http.c tls.c rule.c
\
acl.c http.c tls.c rule.c
\
crypto.c aead.c stream.c base64.c
\
crypto.c aead.c stream.c base64.c
\
plugin.c
\
plugin.c
ppbloom.c
\
android.c
android.c
LOCAL_MODULE
:=
ss-local
LOCAL_MODULE
:=
ss-local
...
@@ -264,13 +280,14 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
...
@@ -264,13 +280,14 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/pcre
\
-I
$(LOCAL_PATH)
/pcre
\
-I
$(LOCAL_PATH)
/libudns
\
-I
$(LOCAL_PATH)
/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libbloom
\
-I
$(LOCAL_PATH)
/libev
-I
$(LOCAL_PATH)
/libev
LOCAL_STATIC_LIBRARIES
:=
libev libmbedtls libipset libcork libudns
\
LOCAL_STATIC_LIBRARIES
:=
libev libmbedtls libipset libcork lib
bloom lib
udns
\
libsodium libancillary libpcre
libsodium libancillary libpcre
LOCAL_LDLIBS
:=
-llog
LOCAL_LDLIBS
:=
-llog
...
@@ -286,7 +303,7 @@ include $(CLEAR_VARS)
...
@@ -286,7 +303,7 @@ include $(CLEAR_VARS)
SHADOWSOCKS_SOURCES
:=
tunnel.c
\
SHADOWSOCKS_SOURCES
:=
tunnel.c
\
cache.c udprelay.c utils.c netutils.c json.c jconf.c
\
cache.c udprelay.c utils.c netutils.c json.c jconf.c
\
crypto.c aead.c stream.c base64.c
\
crypto.c aead.c stream.c base64.c
\
plugin.c
\
plugin.c
ppbloom.c
\
android.c
android.c
LOCAL_MODULE
:=
ss-tunnel
LOCAL_MODULE
:=
ss-tunnel
...
@@ -297,14 +314,15 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
...
@@ -297,14 +314,15 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/libudns
\
-I
$(LOCAL_PATH)
/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/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)
/libev
\
-I
$(LOCAL_PATH)
/libev
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libbloom
\
-I
$(LOCAL_PATH)
/include/shadowsocks-libev
-I
$(LOCAL_PATH)
/include/shadowsocks-libev
LOCAL_STATIC_LIBRARIES
:=
libev libmbedtls libsodium libcork libudns libancillary
LOCAL_STATIC_LIBRARIES
:=
libev libmbedtls libsodium libcork lib
bloom lib
udns libancillary
LOCAL_LDLIBS
:=
-llog
LOCAL_LDLIBS
:=
-llog
...
...
shadowsocks-libev
@
de91b394
Subproject commit d
434cd20ec1900b3ace7bc204439707ee4a54a31
Subproject commit d
e91b394a92af71a34bcbe5b0a165cd77e4e872e
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