wownero
/
wownerujo
Archived
4
0
Fork 0

add sodium to android cmake

openssl-1.1.0
fuwa 6 years ago
parent d9de0b1afa
commit 9b10592dd1

1
.gitignore vendored

@ -11,5 +11,6 @@ opt
vendor vendor
external-libs/monero external-libs/monero
external-libs/libsodium
tmp tmp
builder builder

@ -7,6 +7,14 @@ add_library( monerujo
set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../external-libs) set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../external-libs)
############
# libsodium
############
add_library(sodium STATIC IMPORTED)
set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/libsodium/lib/${ANDROID_ABI}/libsodium.a)
############ ############
# OpenSSL # OpenSSL
############ ############
@ -183,6 +191,7 @@ target_link_libraries( monerujo
ssl ssl
crypto crypto
sodium
${log-lib} ${log-lib}
) )

@ -7,7 +7,7 @@ set -e
orig_path=$PATH orig_path=$PATH
build_root=$EXTERNAL_LIBS_BUILD_ROOT build_root=$EXTERNAL_LIBS_BUILD_ROOT
packages=(boost openssl monero) packages=(boost openssl monero libsodium)
archs=(arm arm64 x86 x86_64) archs=(arm arm64 x86 x86_64)
for arch in ${archs[@]}; do for arch in ${archs[@]}; do