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
935ae29f
Commit
935ae29f
authored
Dec 24, 2018
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the crash on armeabi devices with NDK r18b, #2041
parent
d16cb58c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
core/src/main/jni/Android.mk
core/src/main/jni/Android.mk
+2
-2
core/src/main/jni/libsodium
core/src/main/jni/libsodium
+1
-1
core/src/main/jni/shadowsocks-libev
core/src/main/jni/shadowsocks-libev
+1
-1
No files found.
core/src/main/jni/Android.mk
View file @
935ae29f
...
@@ -25,9 +25,9 @@ BUILD_SHARED_EXECUTABLE := $(LOCAL_PATH)/build-shared-executable.mk
...
@@ -25,9 +25,9 @@ BUILD_SHARED_EXECUTABLE := $(LOCAL_PATH)/build-shared-executable.mk
include
$(CLEAR_VARS)
include
$(CLEAR_VARS)
SODIUM_SOURCE
:=
\
SODIUM_SOURCE
:=
\
crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
\
crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
\
crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
\
crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
\
crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
\
crypto_core/curve25519/ref10/curve25519_ref10.c
\
crypto_core/hchacha20/core_hchacha20.c
\
crypto_core/hchacha20/core_hchacha20.c
\
crypto_core/salsa/ref/core_salsa_ref.c
\
crypto_core/salsa/ref/core_salsa_ref.c
\
crypto_generichash/blake2b/ref/blake2b-compress-ref.c
\
crypto_generichash/blake2b/ref/blake2b-compress-ref.c
\
...
@@ -197,7 +197,7 @@ CORK_SOURCE := $(cli_src) $(core_src) $(ds_src) $(posix_src) $(pthreads_src)
...
@@ -197,7 +197,7 @@ CORK_SOURCE := $(cli_src) $(core_src) $(ds_src) $(posix_src) $(pthreads_src)
LOCAL_MODULE
:=
libcork
LOCAL_MODULE
:=
libcork
LOCAL_CFLAGS
+=
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
LOCAL_CFLAGS
+=
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-DCORK_API
=
CORK_LOCAL
-DCORK_API
=
CORK_LOCAL
-Ofast
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libcork/src/libcork/,
$(CORK_SOURCE)
)
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libcork/src/libcork/,
$(CORK_SOURCE)
)
...
...
libsodium
@
fec4c92d
Subproject commit
c5e43f4c1cf62b4669b1f33516fc33ef2d005187
Subproject commit
fec4c92d81189e0394ad94e14f238a837c81385e
shadowsocks-libev
@
39695963
Subproject commit
57e74eaa3430e82a66337c6e72876b79ea33bcc0
Subproject commit
396959635c8c06b9490c8a90897eb31c1484f1f1
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