diff --git a/app/build.gradle b/app/build.gradle index ff0a813..1970030 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.m2049r.xmrwallet" minSdkVersion 21 targetSdkVersion 25 - versionCode 72 - versionName "1.3.12 'Satoshis Dream'" + versionCode 73 + versionName "1.3.13 'Satoshis Dream'" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { @@ -18,7 +18,7 @@ android { } } ndk { - abiFilters 'armeabi-v7a' + abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' } } @@ -41,10 +41,23 @@ android { abi { enable true reset() - include "armeabi-v7a" + include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' universalApk false } } + + // Map for the version code that gives each ABI a value. + def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4] + + // APKs for the same app that all have the same version information. + android.applicationVariants.all { variant -> + // Assigns a different version code for each output APK. + variant.outputs.each { + output -> + def abiName = output.getFilter(com.android.build.OutputFile.ABI) + output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * variant.versionCode + } + } } dependencies { diff --git a/doc/BUILDING-external-libs-64-bit.md b/doc/BUILDING-external-libs-64-bit.md deleted file mode 100644 index 0f7584e..0000000 --- a/doc/BUILDING-external-libs-64-bit.md +++ /dev/null @@ -1,199 +0,0 @@ -# BUILDING external libs (64-bit) - -## Prepare Ubuntu environment - -``` -sudo apt-get install build-essential cmake tofrodos libtool-bin -sudo mkdir /opt/android -sudo chown $LOGNAME /opt/android -``` - -## Install Android NDK -``` -cd /opt/android -wget https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip -unzip android-ndk-r15c-linux-x86_64.zip -android-ndk-r15c/build/tools/make_standalone_toolchain.py --api 21 --stl=libc++ --arch arm64 --install-dir /opt/android/tool64 -``` - -## Build OpenSSL -Best is to compile openssl from sources. Copying from your phone or elsewhere (don't!) ends up in misery. - -### Setup environment -``` -cd /opt/android -wget https://wiki.openssl.org/images/7/70/Setenv-android.sh -fromdos Setenv-android.sh -``` - -Apply the following patch: -``` ---- a/Setenv-android.sh -+++ b/Setenv-android.sh -@@ -22,12 +22,12 @@ - # list in $ANDROID_NDK_ROOT/toolchains. This value is always used. - # _ANDROID_EABI="x86-4.6" - # _ANDROID_EABI="arm-linux-androideabi-4.6" --_ANDROID_EABI="arm-linux-androideabi-4.8" -+_ANDROID_EABI="aarch64-linux-android-4.9" - - # Set _ANDROID_ARCH to the architecture you are building for. - # This value is always used. - # _ANDROID_ARCH=arch-x86 --_ANDROID_ARCH=arch-arm -+_ANDROID_ARCH=arch-arm64 - - # Set _ANDROID_API to the API you want to use. You should set it - # to one of: android-14, android-9, android-8, android-14, android-5 -@@ -36,7 +36,7 @@ - # Android 5.0, there will likely be another platform added (android-22?). - # This value is always used. - # _ANDROID_API="android-14" --_ANDROID_API="android-18" -+_ANDROID_API="android-21" - # _ANDROID_API="android-19" - - ##################################################################### -@@ -121,6 +121,9 @@ - arch-arm) - ANDROID_TOOLS="arm-linux-androideabi-gcc arm-linux-androideabi-ranlib arm-linux-androideabi-ld" - ;; -+ arch-arm64) -+ ANDROID_TOOLS="aarch64-linux-android-gcc aarch64-linux-android-ranlib aarch64-linux-android-ld" -+ ;; - arch-x86) - ANDROID_TOOLS="i686-linux-android-gcc i686-linux-android-ranlib i686-linux-android-ld" - ;; -@@ -198,6 +201,14 @@ - export ARCH=arm - export CROSS_COMPILE="arm-linux-androideabi-" - -+if [ "$_ANDROID_ARCH" == "arch-arm64" ]; then -+ export MACHINE=aarch64 -+ export RELEASE=2.6.37 -+ export SYSTEM=android -+ export ARCH=aarch64 -+ export CROSS_COMPILE="aarch64-linux-android-" -+fi -+ - if [ "$_ANDROID_ARCH" == "arch-x86" ]; then - export MACHINE=i686 - export RELEASE=2.6.37 -``` -Then: -``` -export ANDROID_NDK_ROOT=/opt/android/android-ndk-r15c -. ./Setenv-android.sh -``` -and ignore error about FIPS_SIG. - -### Download and build OpenSSL -``` -wget https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz -tar xfz OpenSSL_1_0_2l.tar.gz -``` -Apply patch required to build for aarch64: -``` ---- a/openssl-OpenSSL_1_0_2l/config -+++ b/openssl-OpenSSL_1_0_2l/config -@@ -871,6 +871,7 @@ - *-*-qnx6) OUT="QNX6" ;; - x86-*-android|i?86-*-android) OUT="android-x86" ;; - armv[7-9]*-*-android) OUT="android-armv7" ;; -+ aarch64-*-android) OUT="android-aarch64" ;; - *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; - esac - ---- a/openssl-OpenSSL_1_0_2l/Configure -+++ b/openssl-OpenSSL_1_0_2l/Configure -@@ -474,6 +474,7 @@ - "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"android-aarch64","gcc:-march=armv8-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - - #### *BSD [do see comment about ${BSDthreads} above!] - -``` -``` -cd openssl-OpenSSL_1_0_2l/ -perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org -./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir=/opt/android/openssl/android-21/ -make depend -# Make sure we don't get versioned .so which Android can't deal with -make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" MAKE="make -e" all -mkdir -p /opt/android/openssl/android-21/lib -echo "place-holder make target for avoiding symlinks" >> /opt/android/openssl/android-21/lib/link-shared -make SHLIB_EXT=.so install_sw -``` - -### Make symlinks -``` -cd /opt/android/tool64/sysroot/usr/include -ln -s ../../../../openssl/android-21/include/openssl -cd /opt/android/tool64/sysroot/usr/lib -ln -s ../../../../openssl/android-21/lib/libssl.so -ln -s ../../../../openssl/android-21/lib/libcrypto.so -``` - -## Build Boost -``` -cd /opt/android -wget https://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.gz/download -O boost_1_58_0.tar.gz -tar xfz boost_1_58_0.tar.gz -cd boost_1_58_0 -./bootstrap.sh -``` -The NDK r15c above gives errors about fsetpos and fgetpos not found(!?!), so we "just" comment them out in the include file: -`nano /opt/android/tool64/include/c++/4.9.x/cstdio` (`//using ::fgetpos`, `//using ::fsetpos`) - -Then: -``` -export PATH=/opt/android/tool64/aarch64-linux-android/bin:/opt/android/tool64/bin:$PATH -./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --build-dir=android64 --stagedir=android64 toolset=clang threading=multi threadapi=pthread target-os=android stage -``` - -## Build & prepare zeromq -Only needed for zeromq versions (>v0.11.1.0). -``` -cd /opt/android -git clone https://github.com/zeromq/zeromq3-x.git -export PATH=/opt/android/tool64/aarch64-linux-android/bin:/opt/android/tool64/bin:$PATH -export OUTPUT_DIR=/opt/android/zeromq -./configure --enable-static --disable-shared --host=aarch64-linux-android --prefix=$OUTPUT_DIR LDFLAGS="-L$OUTPUT_DIR/lib" CPPFLAGS="-isystem /opt/android/tool64/include/c++/4.9.x -fPIC -I$OUTPUT_DIR/include -Wno-error -D__ANDROID_API__=21" LIBS="-lgcc" -make -make install - -git clone https://github.com/zeromq/cppzmq.git -cp cppzmq/*.hpp zeromq/include/ -``` - -## And finally: Build Monero -``` -cd /opt/android -git clone https://github.com/m2049r/monero.git -cd monero -git checkout monerujo-v0.11.1.0 - -mkdir -p build/release.android64 -cd build/release.android64 - -# only if not set already set -export PATH=/opt/android/tool64/aarch64-linux-android/bin:/opt/android/tool64/bin:$PATH - -# for zeromq versions (>v0.11.1.0) - not really tested -CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv8-a" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_64_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_64_0/android64/lib -D OPENSSL_ROOT_DIR=/opt/android/openssl/android-21 -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -D ZMQ_INCLUDE_PATH=/opt/android/zeromq/include -D ZMQ_LIB=/opt/android/zeromq/lib/libzmq.a ../.. - -# for pre-zeromq versions (<=v0.11.1.0). -CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv8-a" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/android64/lib -D OPENSSL_ROOT_DIR=/opt/android/openssl/android-21 -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../.. - -make - -find . -name '*.a' -exec cp '{}' lib \; -``` -Ignore the warning from the last command - all static libraries are now in `lib`. - -# Bringing it all together -- Copy all .a libraries into the appropriate `external-libs` folders. -- Copy `/opt/android/monero/src/wallet/wallet2_api.h` into `external-libs/monero/include` diff --git a/doc/BUILDING-external-libs.md b/doc/BUILDING-external-libs.md index 05f834b..1fe2f3b 100644 --- a/doc/BUILDING-external-libs.md +++ b/doc/BUILDING-external-libs.md @@ -2,8 +2,11 @@ Based on https://forum.getmonero.org/5/support/87643/building-monero-v0-10-3-1-for-android and the internet. -Do not follow this blindly. These instructions are for 32-bit only. 64-bit building mostly involves -replacing "32" with "64". +Do not follow this blindly. + +These instructions build all supported architectures: ```'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'```. + +Yes, lots of copy&paste here. TODO: Script this. ## Prepare Ubuntu environment @@ -19,52 +22,51 @@ cd /opt/android wget https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip unzip android-ndk-r15c-linux-x86_64.zip android-ndk-r15c/build/tools/make_standalone_toolchain.py --api 21 --stl=libc++ --arch arm --install-dir /opt/android/tool32 +android-ndk-r15c/build/tools/make_standalone_toolchain.py --api 21 --stl=libc++ --arch arm64 --install-dir /opt/android/tool64 +android-ndk-r15c/build/tools/make_standalone_toolchain.py --api 21 --stl=libc++ --arch x86 --install-dir /opt/android/toolx86 +android-ndk-r15c/build/tools/make_standalone_toolchain.py --api 21 --stl=libc++ --arch x86_64 --install-dir /opt/android/toolx86_64 ``` ## Build OpenSSL Best is to compile openssl from sources. Copying from your phone or elsewhere (don't!) ends up in misery. -### Setup environment +If you don't want to build for all architectures, edit ```build-all-arch.sh``` before running it (Line 12). + ``` cd /opt/android -wget https://wiki.openssl.org/images/7/70/Setenv-android.sh -fromdos Setenv-android.sh -``` - -Edit Setenv-android.sh: -``` -_ANDROID_EABI="arm-linux-androideabi-4.9" -_ANDROID_API="android-21" -``` -Then: -``` -export ANDROID_NDK_ROOT=/opt/android/android-ndk-r15c -. ./Setenv-android.sh -``` -and ignore error about FIPS_SIG. - -### Download and build OpenSSL -``` +git clone https://github.com/m2049r/android-openssl.git wget https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz -tar xfz OpenSSL_1_0_2l.tar.gz -cd openssl-OpenSSL_1_0_2l/ -perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org -./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir=/opt/android/openssl/android-21/ -make depend -# Make sure we don't get versioned .so which Android can't deal with -make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" MAKE="make -e" all -mkdir -p /opt/android/openssl/android-21/lib -echo "place-holder make target for avoiding symlinks" >> /opt/android/openssl/android-21/lib/link-shared -make SHLIB_EXT=.so install_sw +cd android-openssl +tar xfz ../OpenSSL_1_0_2l.tar.gz +export ANDROID_NDK_ROOT=/opt/android/android-ndk-r15c +./build-all-arch.sh ``` ### Make symlinks ``` cd /opt/android/tool32/sysroot/usr/include -ln -s ../../../../openssl/android-21/include/openssl +ln -s ../../../../android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ cd /opt/android/tool32/sysroot/usr/lib -ln -s ../../../../openssl/android-21/lib/libssl.so -ln -s ../../../../openssl/android-21/lib/libcrypto.so +ln -s ../../../../android-openssl/prebuilt/armeabi/libssl.so +ln -s ../../../../android-openssl/prebuilt/armeabi/libcrypto.so + +cd /opt/android/tool64/sysroot/usr/include +ln -s ../../../../android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ +cd /opt/android/tool64/sysroot/usr/lib +ln -s ../../../../android-openssl/prebuilt/arm64-v8a/libssl.so +ln -s ../../../../android-openssl/prebuilt/arm64-v8a/libcrypto.so + +cd /opt/android/toolx86/sysroot/usr/include +ln -s ../../../../android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ +cd /opt/android/toolx86/sysroot/usr/lib +ln -s ../../../../android-openssl/prebuilt/x86/libssl.so +ln -s ../../../../android-openssl/prebuilt/x86/libcrypto.so + +cd /opt/android/toolx86_64/sysroot/usr/include +ln -s ../../../../android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ +cd /opt/android/toolx86_64/sysroot/usr/lib +ln -s ../../../../android-openssl/prebuilt/x86_64/libssl.so +ln -s ../../../../android-openssl/prebuilt/x86_64/libcrypto.so ``` ## Build Boost @@ -72,74 +74,89 @@ ln -s ../../../../openssl/android-21/lib/libcrypto.so cd /opt/android wget https://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.gz/download -O boost_1_58_0.tar.gz tar xfz boost_1_58_0.tar.gz -(cd boost_1_58_0; ./bootstrap.sh) +cd boost_1_58_0 +./bootstrap.sh ``` The NDK r15c above gives errors about fsetpos and fgetpos not found(!?!), so we "just" comment them out in the include file: -`nano /opt/android/tool32/include/c++/4.9.x/cstdio` (`//using ::fgetpos`, `//using ::fsetpos`) +* `vi /opt/android/tool32/include/c++/4.9.x/cstdio` (`//using ::fgetpos`, `//using ::fsetpos`) +* `vi /opt/android/tool64/include/c++/4.9.x/cstdio` (`//using ::fgetpos`, `//using ::fsetpos`) +* `vi /opt/android/toolx86/include/c++/4.9.x/cstdio` (`//using ::fgetpos`, `//using ::fsetpos`) +* `vi /opt/android/toolx86_64/include/c++/4.9.x/cstdio` (`//using ::fgetpos`, `//using ::fsetpos`) Then: ``` -export PATH=/opt/android/tool32/arm-linux-androideabi/bin:/opt/android/tool32/bin:$PATH -./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --build-dir=android32 --stagedir=android32 toolset=clang threading=multi threadapi=pthread target-os=android stage -``` - -## Build & prepare zeromq -Only needed for zeromq versions (>v0.11.0.0). -``` -cd /opt/android -wget git clone https://github.com/zeromq/zeromq3-x.git -export PATH=/opt/android/tool32/arm-linux-androideabi/bin:/opt/android/tool32/bin:$PATH -export OUTPUT_DIR=/opt/android/zeromq -./configure --enable-static --disable-shared --host=arm-linux-androideabi --prefix=$OUTPUT_DIR LDFLAGS="-L$OUTPUT_DIR/lib" CPPFLAGS="-isystem /opt/android/tool32/include/c++/4.9.x -fPIC -I$OUTPUT_DIR/include -Wno-error -D__ANDROID_API__=21" LIBS="-lgcc" -make -make install - -git clone https://github.com/zeromq/cppzmq.git -cp cppzmq/*.hpp zeromq/include/ +PATH=/opt/android/tool32/arm-linux-androideabi/bin:/opt/android/tool32/bin:$PATH ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --build-dir=android32 --stagedir=android32 toolset=clang threading=multi threadapi=pthread target-os=android stage +PATH=/opt/android/tool64/aarch64-linux-android/bin:/opt/android/tool64/bin:$PATH ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --build-dir=android64 --stagedir=android64 toolset=clang threading=multi threadapi=pthread target-os=android stage +PATH=/opt/android/toolx86/i686-linux-android/bin:/opt/android/toolx86/bin:$PATH ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --build-dir=androidx86 --stagedir=androidx86 toolset=clang threading=multi threadapi=pthread target-os=android stage +PATH=/opt/android/toolx86_64/x86_64-linux-android/bin:/opt/android/toolx86_64/bin:$PATH ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --build-dir=androidx86_64 --stagedir=androidx86_64 toolset=clang threading=multi threadapi=pthread target-os=android stage ``` ## And finally: Build Monero ``` cd /opt/android -git clone https://github.com/monero-project/monero -cd monero -``` -``` -# -# also, don't abort on warnings (this is only an issue >v0.11.0.0): -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f74f59..2c791c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -400,7 +400,7 @@ else() - set(ARCH_FLAG "-march=${ARCH}") - endif() - set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-variable -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized") -- if(NOT MINGW) -+ if(NOT MINGW AND NOT ANDROID) - set(WARNINGS_AS_ERRORS_FLAG "-Werror") - endif() - if(CMAKE_C_COMPILER_ID STREQUAL "Clang") -``` -``` +git clone https://github.com/m2049r/monero.git + +cd /opt/android/monero mkdir -p build/release.android32 cd build/release.android32 - -# only if not set already set -export PATH=/opt/android/tool32/arm-linux-androideabi/bin:/opt/android/tool32/bin:$PATH - -# for zeromq versions (>v0.11.0.0). -CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/android32/lib -D OPENSSL_ROOT_DIR=/opt/android/openssl/android-21 -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -D ZMQ_INCLUDE_PATH=/opt/android/zeromq/include -D ZMQ_LIB=/opt/android/zeromq/lib/libzmq.a ../.. - -# for pre-zeromq versions (<=v0.11.0.0). -CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/android32/lib -D OPENSSL_ROOT_DIR=/opt/android/openssl/android-21 -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../.. - +PATH=/opt/android/tool32/arm-linux-androideabi/bin:/opt/android/tool32/bin:$PATH CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/android32/lib -D OPENSSL_ROOT_DIR=/opt/android/android-openssl/openssl-OpenSSL_1_0_2l -D OPENSSL_CRYPTO_LIBRARY=/opt/android/android-openssl/prebuilt/armeabi/libcrypto.so -D OPENSSL_SSL_LIBRARY=/opt/android/android-openssl/prebuilt/armeabi/libssl.so -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../.. make +find . -name '*.a' -exec cp '{}' lib \; +cd /opt/android/monero +mkdir -p build/release.android64 +cd build/release.android64 +PATH=/opt/android/tool64/aarch64-linux-android/bin:/opt/android/tool64/bin:$PATH CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv8-a" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/android64/lib -D OPENSSL_ROOT_DIR=/opt/android/android-openssl/openssl-OpenSSL_1_0_2l -D OPENSSL_CRYPTO_LIBRARY=/opt/android/android-openssl/prebuilt/arm64-v8a/libcrypto.so -D OPENSSL_SSL_LIBRARY=/opt/android/android-openssl/prebuilt/arm64-v8a/libssl.so -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../.. +make +find . -name '*.a' -exec cp '{}' lib \; + +cd /opt/android/monero +mkdir -p build/release.androidx86 +cd build/release.androidx86 +PATH=/opt/android/toolx86/i686-linux-android/bin:/opt/android/toolx86/bin:$PATH CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="i686" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/androidx86/lib -D OPENSSL_ROOT_DIR=/opt/android/android-openssl/openssl-OpenSSL_1_0_2l -D OPENSSL_CRYPTO_LIBRARY=/opt/android/android-openssl/prebuilt/x86/libcrypto.so -D OPENSSL_SSL_LIBRARY=/opt/android/android-openssl/prebuilt/x86/libssl.so -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../.. +make +find . -name '*.a' -exec cp '{}' lib \; + +cd /opt/android/monero +mkdir -p build/release.androidx86_64 +cd build/release.androidx86_64 +PATH=/opt/android/toolx86_64/x86_64-linux-android/bin:/opt/android/toolx86_64/bin:$PATH CC=clang CXX=clang++ cmake -D BUILD_TESTS=OFF -D ARCH="x86-64" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/boost_1_58_0 -D BOOST_LIBRARYDIR=/opt/android/boost_1_58_0/androidx86_64/lib -D OPENSSL_ROOT_DIR=/opt/android/android-openssl/openssl-OpenSSL_1_0_2l -D OPENSSL_CRYPTO_LIBRARY=/opt/android/android-openssl/prebuilt/x86_64/libcrypto.so -D OPENSSL_SSL_LIBRARY=/opt/android/android-openssl/prebuilt/x86_64/libssl.so -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../.. +make find . -name '*.a' -exec cp '{}' lib \; ``` -Ignore the warning from the last command - all static libraries are now in `lib`. +Ignore the warning from ```find``` - all monero static libraries are now in `lib`. # Bringing it all together - Copy all .a libraries into the appropriate `external-libs` folders. - Copy `/opt/android/monero/src/wallet/wallet2_api.h` into `external-libs/monero/include` + +If using default locations, this would mean: +``` +mkdir -p ~/StudioProjects/xmrwallet/external-libs/boost/lib/armeabi-v7a +cp -a /opt/android/boost_1_58_0/android32/lib/*.a ~/StudioProjects/xmrwallet/external-libs/boost/lib/armeabi-v7a +mkdir -p ~/StudioProjects/xmrwallet/external-libs/openssl/lib/armeabi-v7a +cp -a /opt/android/android-openssl/prebuilt/armeabi/*.a ~/StudioProjects/xmrwallet/external-libs/openssl/lib/armeabi-v7a +mkdir -p ~/StudioProjects/xmrwallet/external-libs/monero/lib/armeabi-v7a +cp -a /opt/android/monero/build/release.android32/lib/*.a ~/StudioProjects/xmrwallet/external-libs/monero/lib/armeabi-v7a + +mkdir -p ~/StudioProjects/xmrwallet/external-libs/boost/lib/arm64-v8a +cp -a /opt/android/boost_1_58_0/android64/lib/*.a ~/StudioProjects/xmrwallet/external-libs/boost/lib/arm64-v8a +mkdir -p ~/StudioProjects/xmrwallet/external-libs/openssl/lib/arm64-v8a +cp -a /opt/android/android-openssl/prebuilt/arm64-v8a/*.a ~/StudioProjects/xmrwallet/external-libs/openssl/lib/arm64-v8a +mkdir -p ~/StudioProjects/xmrwallet/external-libs/monero/lib/arm64-v8a +cp -a /opt/android/monero/build/release.android64/lib/*.a ~/StudioProjects/xmrwallet/external-libs/monero/lib/arm64-v8a + +mkdir -p ~/StudioProjects/xmrwallet/external-libs/boost/lib/x86 +cp -a /opt/android/boost_1_58_0/androidx86/lib/*.a ~/StudioProjects/xmrwallet/external-libs/boost/lib/x86 +mkdir -p ~/StudioProjects/xmrwallet/external-libs/openssl/lib/x86 +cp -a /opt/android/android-openssl/prebuilt/x86/*.a ~/StudioProjects/xmrwallet/external-libs/openssl/lib/x86 +mkdir -p ~/StudioProjects/xmrwallet/external-libs/monero/lib/x86 +cp -a /opt/android/monero/build/release.androidx86/lib/*.a ~/StudioProjects/xmrwallet/external-libs/monero/lib/x86 + +mkdir -p ~/StudioProjects/xmrwallet/external-libs/boost/lib/x86_64 +cp -a /opt/android/boost_1_58_0/androidx86_64/lib/*.a ~/StudioProjects/xmrwallet/external-libs/boost/lib/x86_64 +mkdir -p ~/StudioProjects/xmrwallet/external-libs/openssl/lib/x86_64 +cp -a /opt/android/android-openssl/prebuilt/x86_64/*.a ~/StudioProjects/xmrwallet/external-libs/openssl/lib/x86_64 +mkdir -p ~/StudioProjects/xmrwallet/external-libs/monero/lib/x86_64 +cp -a /opt/android/monero/build/release.androidx86_64/lib/*.a ~/StudioProjects/xmrwallet/external-libs/monero/lib/x86_64 +``` diff --git a/external-libs/boost/lib/arm64-v8a/libboost_chrono.a b/external-libs/boost/lib/arm64-v8a/libboost_chrono.a new file mode 100644 index 0000000..55b7b44 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_chrono.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_date_time.a b/external-libs/boost/lib/arm64-v8a/libboost_date_time.a new file mode 100644 index 0000000..2651ba4 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_date_time.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_filesystem.a b/external-libs/boost/lib/arm64-v8a/libboost_filesystem.a new file mode 100644 index 0000000..fc58f1d Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_filesystem.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_program_options.a b/external-libs/boost/lib/arm64-v8a/libboost_program_options.a new file mode 100644 index 0000000..6fa263b Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_program_options.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_regex.a b/external-libs/boost/lib/arm64-v8a/libboost_regex.a new file mode 100644 index 0000000..9837e23 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_regex.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_serialization.a b/external-libs/boost/lib/arm64-v8a/libboost_serialization.a new file mode 100644 index 0000000..05882a4 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_serialization.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_system.a b/external-libs/boost/lib/arm64-v8a/libboost_system.a new file mode 100644 index 0000000..38dbd71 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_system.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_thread.a b/external-libs/boost/lib/arm64-v8a/libboost_thread.a new file mode 100644 index 0000000..48da818 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_thread.a differ diff --git a/external-libs/boost/lib/arm64-v8a/libboost_wserialization.a b/external-libs/boost/lib/arm64-v8a/libboost_wserialization.a new file mode 100644 index 0000000..6ee6a55 Binary files /dev/null and b/external-libs/boost/lib/arm64-v8a/libboost_wserialization.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_chrono.a b/external-libs/boost/lib/armeabi-v7a/libboost_chrono.a index c5d567c..932f6b6 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_chrono.a and b/external-libs/boost/lib/armeabi-v7a/libboost_chrono.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_date_time.a b/external-libs/boost/lib/armeabi-v7a/libboost_date_time.a index 88c68a8..e62a5e8 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_date_time.a and b/external-libs/boost/lib/armeabi-v7a/libboost_date_time.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_filesystem.a b/external-libs/boost/lib/armeabi-v7a/libboost_filesystem.a index d7b0a3c..95d7617 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_filesystem.a and b/external-libs/boost/lib/armeabi-v7a/libboost_filesystem.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_program_options.a b/external-libs/boost/lib/armeabi-v7a/libboost_program_options.a index e40f850..e879b2a 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_program_options.a and b/external-libs/boost/lib/armeabi-v7a/libboost_program_options.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_regex.a b/external-libs/boost/lib/armeabi-v7a/libboost_regex.a index 035d25c..c674b31 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_regex.a and b/external-libs/boost/lib/armeabi-v7a/libboost_regex.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_serialization.a b/external-libs/boost/lib/armeabi-v7a/libboost_serialization.a index d42d178..956aec8 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_serialization.a and b/external-libs/boost/lib/armeabi-v7a/libboost_serialization.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_system.a b/external-libs/boost/lib/armeabi-v7a/libboost_system.a index 0674403..04305bd 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_system.a and b/external-libs/boost/lib/armeabi-v7a/libboost_system.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_thread.a b/external-libs/boost/lib/armeabi-v7a/libboost_thread.a index 6051728..cf16fae 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_thread.a and b/external-libs/boost/lib/armeabi-v7a/libboost_thread.a differ diff --git a/external-libs/boost/lib/armeabi-v7a/libboost_wserialization.a b/external-libs/boost/lib/armeabi-v7a/libboost_wserialization.a index 1b2ccaf..0325cc4 100644 Binary files a/external-libs/boost/lib/armeabi-v7a/libboost_wserialization.a and b/external-libs/boost/lib/armeabi-v7a/libboost_wserialization.a differ diff --git a/external-libs/boost/lib/x86/libboost_chrono.a b/external-libs/boost/lib/x86/libboost_chrono.a new file mode 100644 index 0000000..0c6eb5e Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_chrono.a differ diff --git a/external-libs/boost/lib/x86/libboost_date_time.a b/external-libs/boost/lib/x86/libboost_date_time.a new file mode 100644 index 0000000..b21277b Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_date_time.a differ diff --git a/external-libs/boost/lib/x86/libboost_filesystem.a b/external-libs/boost/lib/x86/libboost_filesystem.a new file mode 100644 index 0000000..1212b5c Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_filesystem.a differ diff --git a/external-libs/boost/lib/x86/libboost_program_options.a b/external-libs/boost/lib/x86/libboost_program_options.a new file mode 100644 index 0000000..cecd498 Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_program_options.a differ diff --git a/external-libs/boost/lib/x86/libboost_regex.a b/external-libs/boost/lib/x86/libboost_regex.a new file mode 100644 index 0000000..919f874 Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_regex.a differ diff --git a/external-libs/boost/lib/x86/libboost_serialization.a b/external-libs/boost/lib/x86/libboost_serialization.a new file mode 100644 index 0000000..c1a1a61 Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_serialization.a differ diff --git a/external-libs/boost/lib/x86/libboost_system.a b/external-libs/boost/lib/x86/libboost_system.a new file mode 100644 index 0000000..057450f Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_system.a differ diff --git a/external-libs/boost/lib/x86/libboost_thread.a b/external-libs/boost/lib/x86/libboost_thread.a new file mode 100644 index 0000000..667238d Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_thread.a differ diff --git a/external-libs/boost/lib/x86/libboost_wserialization.a b/external-libs/boost/lib/x86/libboost_wserialization.a new file mode 100644 index 0000000..c42596d Binary files /dev/null and b/external-libs/boost/lib/x86/libboost_wserialization.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_chrono.a b/external-libs/boost/lib/x86_64/libboost_chrono.a new file mode 100644 index 0000000..507b330 Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_chrono.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_date_time.a b/external-libs/boost/lib/x86_64/libboost_date_time.a new file mode 100644 index 0000000..48b68f8 Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_date_time.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_filesystem.a b/external-libs/boost/lib/x86_64/libboost_filesystem.a new file mode 100644 index 0000000..b11bc89 Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_filesystem.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_program_options.a b/external-libs/boost/lib/x86_64/libboost_program_options.a new file mode 100644 index 0000000..44e6cae Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_program_options.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_regex.a b/external-libs/boost/lib/x86_64/libboost_regex.a new file mode 100644 index 0000000..7778561 Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_regex.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_serialization.a b/external-libs/boost/lib/x86_64/libboost_serialization.a new file mode 100644 index 0000000..1316ea8 Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_serialization.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_system.a b/external-libs/boost/lib/x86_64/libboost_system.a new file mode 100644 index 0000000..d99c97c Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_system.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_thread.a b/external-libs/boost/lib/x86_64/libboost_thread.a new file mode 100644 index 0000000..fa3741d Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_thread.a differ diff --git a/external-libs/boost/lib/x86_64/libboost_wserialization.a b/external-libs/boost/lib/x86_64/libboost_wserialization.a new file mode 100644 index 0000000..4c299ec Binary files /dev/null and b/external-libs/boost/lib/x86_64/libboost_wserialization.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libblockchain_db.a b/external-libs/monero/lib/arm64-v8a/libblockchain_db.a new file mode 100644 index 0000000..e333cba Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libblockchain_db.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libblocks.a b/external-libs/monero/lib/arm64-v8a/libblocks.a new file mode 100644 index 0000000..4bedd4f Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libblocks.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libcncrypto.a b/external-libs/monero/lib/arm64-v8a/libcncrypto.a new file mode 100644 index 0000000..20f89f2 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libcncrypto.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libcommon.a b/external-libs/monero/lib/arm64-v8a/libcommon.a new file mode 100644 index 0000000..a067bc9 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libcommon.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libcryptonote_basic.a b/external-libs/monero/lib/arm64-v8a/libcryptonote_basic.a new file mode 100644 index 0000000..a0e3501 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libcryptonote_basic.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libcryptonote_core.a b/external-libs/monero/lib/arm64-v8a/libcryptonote_core.a new file mode 100644 index 0000000..9877d5c Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libcryptonote_core.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libcryptonote_protocol.a b/external-libs/monero/lib/arm64-v8a/libcryptonote_protocol.a new file mode 100644 index 0000000..007c388 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libcryptonote_protocol.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libdaemonizer.a b/external-libs/monero/lib/arm64-v8a/libdaemonizer.a new file mode 100644 index 0000000..b71e895 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libdaemonizer.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libeasylogging.a b/external-libs/monero/lib/arm64-v8a/libeasylogging.a new file mode 100644 index 0000000..77d5c1d Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libeasylogging.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libepee.a b/external-libs/monero/lib/arm64-v8a/libepee.a new file mode 100644 index 0000000..666d120 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libepee.a differ diff --git a/external-libs/monero/lib/arm64-v8a/liblmdb.a b/external-libs/monero/lib/arm64-v8a/liblmdb.a new file mode 100644 index 0000000..30e0bb9 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/liblmdb.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libminiupnpc.a b/external-libs/monero/lib/arm64-v8a/libminiupnpc.a new file mode 100644 index 0000000..2436631 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libminiupnpc.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libmnemonics.a b/external-libs/monero/lib/arm64-v8a/libmnemonics.a new file mode 100644 index 0000000..f1a51b0 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libmnemonics.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libp2p.a b/external-libs/monero/lib/arm64-v8a/libp2p.a new file mode 100644 index 0000000..d8d3e16 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libp2p.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libringct.a b/external-libs/monero/lib/arm64-v8a/libringct.a new file mode 100644 index 0000000..f32fe91 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libringct.a differ diff --git a/external-libs/monero/lib/arm64-v8a/librpc.a b/external-libs/monero/lib/arm64-v8a/librpc.a new file mode 100644 index 0000000..957cad7 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/librpc.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libunbound.a b/external-libs/monero/lib/arm64-v8a/libunbound.a new file mode 100644 index 0000000..fa0ab48 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libunbound.a differ diff --git a/external-libs/monero/lib/arm64-v8a/libwallet.a b/external-libs/monero/lib/arm64-v8a/libwallet.a new file mode 100644 index 0000000..8dc12b3 Binary files /dev/null and b/external-libs/monero/lib/arm64-v8a/libwallet.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a b/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a index 0ab9c3d..39ba2b3 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a and b/external-libs/monero/lib/armeabi-v7a/libblockchain_db.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libblocks.a b/external-libs/monero/lib/armeabi-v7a/libblocks.a index 8fb914b..b53eeab 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libblocks.a and b/external-libs/monero/lib/armeabi-v7a/libblocks.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcncrypto.a b/external-libs/monero/lib/armeabi-v7a/libcncrypto.a index 57ce2c3..a4c75f5 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcncrypto.a and b/external-libs/monero/lib/armeabi-v7a/libcncrypto.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcommon.a b/external-libs/monero/lib/armeabi-v7a/libcommon.a index 8137fd7..73694e0 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcommon.a and b/external-libs/monero/lib/armeabi-v7a/libcommon.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a b/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a index a02122d..9a198b7 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a and b/external-libs/monero/lib/armeabi-v7a/libcryptonote_basic.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a b/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a index 5777d1f..c56cb7a 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a and b/external-libs/monero/lib/armeabi-v7a/libcryptonote_core.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a b/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a index 38ba507..0ccfe49 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a and b/external-libs/monero/lib/armeabi-v7a/libcryptonote_protocol.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a b/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a index daedb9f..fc50722 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a and b/external-libs/monero/lib/armeabi-v7a/libdaemonizer.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libeasylogging.a b/external-libs/monero/lib/armeabi-v7a/libeasylogging.a index 4a17209..62d93df 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libeasylogging.a and b/external-libs/monero/lib/armeabi-v7a/libeasylogging.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libepee.a b/external-libs/monero/lib/armeabi-v7a/libepee.a index f703a51..e0f0b85 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libepee.a and b/external-libs/monero/lib/armeabi-v7a/libepee.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/liblmdb.a b/external-libs/monero/lib/armeabi-v7a/liblmdb.a index 21b6b54..dc9f513 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/liblmdb.a and b/external-libs/monero/lib/armeabi-v7a/liblmdb.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a b/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a index c6c1359..fb55005 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a and b/external-libs/monero/lib/armeabi-v7a/libminiupnpc.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libmnemonics.a b/external-libs/monero/lib/armeabi-v7a/libmnemonics.a index 727e617..322ec0d 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libmnemonics.a and b/external-libs/monero/lib/armeabi-v7a/libmnemonics.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libp2p.a b/external-libs/monero/lib/armeabi-v7a/libp2p.a index 990ef12..64dfb04 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libp2p.a and b/external-libs/monero/lib/armeabi-v7a/libp2p.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libringct.a b/external-libs/monero/lib/armeabi-v7a/libringct.a index bf6ab9a..19875c7 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libringct.a and b/external-libs/monero/lib/armeabi-v7a/libringct.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/librpc.a b/external-libs/monero/lib/armeabi-v7a/librpc.a index 5ad09a6..6929d36 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/librpc.a and b/external-libs/monero/lib/armeabi-v7a/librpc.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libunbound.a b/external-libs/monero/lib/armeabi-v7a/libunbound.a index 65ac41a..7b74c6d 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libunbound.a and b/external-libs/monero/lib/armeabi-v7a/libunbound.a differ diff --git a/external-libs/monero/lib/armeabi-v7a/libwallet.a b/external-libs/monero/lib/armeabi-v7a/libwallet.a index b38be22..34d6f87 100644 Binary files a/external-libs/monero/lib/armeabi-v7a/libwallet.a and b/external-libs/monero/lib/armeabi-v7a/libwallet.a differ diff --git a/external-libs/monero/lib/x86/libblockchain_db.a b/external-libs/monero/lib/x86/libblockchain_db.a new file mode 100644 index 0000000..d612d77 Binary files /dev/null and b/external-libs/monero/lib/x86/libblockchain_db.a differ diff --git a/external-libs/monero/lib/x86/libblocks.a b/external-libs/monero/lib/x86/libblocks.a new file mode 100644 index 0000000..a3b372f Binary files /dev/null and b/external-libs/monero/lib/x86/libblocks.a differ diff --git a/external-libs/monero/lib/x86/libcncrypto.a b/external-libs/monero/lib/x86/libcncrypto.a new file mode 100644 index 0000000..0cd2f72 Binary files /dev/null and b/external-libs/monero/lib/x86/libcncrypto.a differ diff --git a/external-libs/monero/lib/x86/libcommon.a b/external-libs/monero/lib/x86/libcommon.a new file mode 100644 index 0000000..eb85d0f Binary files /dev/null and b/external-libs/monero/lib/x86/libcommon.a differ diff --git a/external-libs/monero/lib/x86/libcryptonote_basic.a b/external-libs/monero/lib/x86/libcryptonote_basic.a new file mode 100644 index 0000000..c04c7d2 Binary files /dev/null and b/external-libs/monero/lib/x86/libcryptonote_basic.a differ diff --git a/external-libs/monero/lib/x86/libcryptonote_core.a b/external-libs/monero/lib/x86/libcryptonote_core.a new file mode 100644 index 0000000..1855dc2 Binary files /dev/null and b/external-libs/monero/lib/x86/libcryptonote_core.a differ diff --git a/external-libs/monero/lib/x86/libcryptonote_protocol.a b/external-libs/monero/lib/x86/libcryptonote_protocol.a new file mode 100644 index 0000000..f94dc8c Binary files /dev/null and b/external-libs/monero/lib/x86/libcryptonote_protocol.a differ diff --git a/external-libs/monero/lib/x86/libdaemonizer.a b/external-libs/monero/lib/x86/libdaemonizer.a new file mode 100644 index 0000000..48eeaa5 Binary files /dev/null and b/external-libs/monero/lib/x86/libdaemonizer.a differ diff --git a/external-libs/monero/lib/x86/libeasylogging.a b/external-libs/monero/lib/x86/libeasylogging.a new file mode 100644 index 0000000..2c891d1 Binary files /dev/null and b/external-libs/monero/lib/x86/libeasylogging.a differ diff --git a/external-libs/monero/lib/x86/libepee.a b/external-libs/monero/lib/x86/libepee.a new file mode 100644 index 0000000..7eac2a5 Binary files /dev/null and b/external-libs/monero/lib/x86/libepee.a differ diff --git a/external-libs/monero/lib/x86/liblmdb.a b/external-libs/monero/lib/x86/liblmdb.a new file mode 100644 index 0000000..65c6d98 Binary files /dev/null and b/external-libs/monero/lib/x86/liblmdb.a differ diff --git a/external-libs/monero/lib/x86/libminiupnpc.a b/external-libs/monero/lib/x86/libminiupnpc.a new file mode 100644 index 0000000..0afddfa Binary files /dev/null and b/external-libs/monero/lib/x86/libminiupnpc.a differ diff --git a/external-libs/monero/lib/x86/libmnemonics.a b/external-libs/monero/lib/x86/libmnemonics.a new file mode 100644 index 0000000..b7e20b5 Binary files /dev/null and b/external-libs/monero/lib/x86/libmnemonics.a differ diff --git a/external-libs/monero/lib/x86/libp2p.a b/external-libs/monero/lib/x86/libp2p.a new file mode 100644 index 0000000..dbbf1a7 Binary files /dev/null and b/external-libs/monero/lib/x86/libp2p.a differ diff --git a/external-libs/monero/lib/x86/libringct.a b/external-libs/monero/lib/x86/libringct.a new file mode 100644 index 0000000..42a11ac Binary files /dev/null and b/external-libs/monero/lib/x86/libringct.a differ diff --git a/external-libs/monero/lib/x86/librpc.a b/external-libs/monero/lib/x86/librpc.a new file mode 100644 index 0000000..c1f1924 Binary files /dev/null and b/external-libs/monero/lib/x86/librpc.a differ diff --git a/external-libs/monero/lib/x86/libunbound.a b/external-libs/monero/lib/x86/libunbound.a new file mode 100644 index 0000000..6706b06 Binary files /dev/null and b/external-libs/monero/lib/x86/libunbound.a differ diff --git a/external-libs/monero/lib/x86/libwallet.a b/external-libs/monero/lib/x86/libwallet.a new file mode 100644 index 0000000..67da030 Binary files /dev/null and b/external-libs/monero/lib/x86/libwallet.a differ diff --git a/external-libs/monero/lib/x86_64/libblockchain_db.a b/external-libs/monero/lib/x86_64/libblockchain_db.a new file mode 100644 index 0000000..7e0cb63 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libblockchain_db.a differ diff --git a/external-libs/monero/lib/x86_64/libblocks.a b/external-libs/monero/lib/x86_64/libblocks.a new file mode 100644 index 0000000..6bd74ad Binary files /dev/null and b/external-libs/monero/lib/x86_64/libblocks.a differ diff --git a/external-libs/monero/lib/x86_64/libcncrypto.a b/external-libs/monero/lib/x86_64/libcncrypto.a new file mode 100644 index 0000000..1c36414 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libcncrypto.a differ diff --git a/external-libs/monero/lib/x86_64/libcommon.a b/external-libs/monero/lib/x86_64/libcommon.a new file mode 100644 index 0000000..6e3b703 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libcommon.a differ diff --git a/external-libs/monero/lib/x86_64/libcryptonote_basic.a b/external-libs/monero/lib/x86_64/libcryptonote_basic.a new file mode 100644 index 0000000..030f06f Binary files /dev/null and b/external-libs/monero/lib/x86_64/libcryptonote_basic.a differ diff --git a/external-libs/monero/lib/x86_64/libcryptonote_core.a b/external-libs/monero/lib/x86_64/libcryptonote_core.a new file mode 100644 index 0000000..48c8f29 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libcryptonote_core.a differ diff --git a/external-libs/monero/lib/x86_64/libcryptonote_protocol.a b/external-libs/monero/lib/x86_64/libcryptonote_protocol.a new file mode 100644 index 0000000..1df4e5d Binary files /dev/null and b/external-libs/monero/lib/x86_64/libcryptonote_protocol.a differ diff --git a/external-libs/monero/lib/x86_64/libdaemonizer.a b/external-libs/monero/lib/x86_64/libdaemonizer.a new file mode 100644 index 0000000..2d1e3f2 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libdaemonizer.a differ diff --git a/external-libs/monero/lib/x86_64/libeasylogging.a b/external-libs/monero/lib/x86_64/libeasylogging.a new file mode 100644 index 0000000..bc0ce8c Binary files /dev/null and b/external-libs/monero/lib/x86_64/libeasylogging.a differ diff --git a/external-libs/monero/lib/x86_64/libepee.a b/external-libs/monero/lib/x86_64/libepee.a new file mode 100644 index 0000000..88a290f Binary files /dev/null and b/external-libs/monero/lib/x86_64/libepee.a differ diff --git a/external-libs/monero/lib/x86_64/liblmdb.a b/external-libs/monero/lib/x86_64/liblmdb.a new file mode 100644 index 0000000..a18f679 Binary files /dev/null and b/external-libs/monero/lib/x86_64/liblmdb.a differ diff --git a/external-libs/monero/lib/x86_64/libminiupnpc.a b/external-libs/monero/lib/x86_64/libminiupnpc.a new file mode 100644 index 0000000..d4e5094 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libminiupnpc.a differ diff --git a/external-libs/monero/lib/x86_64/libmnemonics.a b/external-libs/monero/lib/x86_64/libmnemonics.a new file mode 100644 index 0000000..db63639 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libmnemonics.a differ diff --git a/external-libs/monero/lib/x86_64/libp2p.a b/external-libs/monero/lib/x86_64/libp2p.a new file mode 100644 index 0000000..d7e2c8a Binary files /dev/null and b/external-libs/monero/lib/x86_64/libp2p.a differ diff --git a/external-libs/monero/lib/x86_64/libringct.a b/external-libs/monero/lib/x86_64/libringct.a new file mode 100644 index 0000000..3826c85 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libringct.a differ diff --git a/external-libs/monero/lib/x86_64/librpc.a b/external-libs/monero/lib/x86_64/librpc.a new file mode 100644 index 0000000..6ae210e Binary files /dev/null and b/external-libs/monero/lib/x86_64/librpc.a differ diff --git a/external-libs/monero/lib/x86_64/libunbound.a b/external-libs/monero/lib/x86_64/libunbound.a new file mode 100644 index 0000000..84d925f Binary files /dev/null and b/external-libs/monero/lib/x86_64/libunbound.a differ diff --git a/external-libs/monero/lib/x86_64/libwallet.a b/external-libs/monero/lib/x86_64/libwallet.a new file mode 100644 index 0000000..aedf5d7 Binary files /dev/null and b/external-libs/monero/lib/x86_64/libwallet.a differ diff --git a/external-libs/openssl/lib/arm64-v8a/libcrypto.a b/external-libs/openssl/lib/arm64-v8a/libcrypto.a new file mode 100644 index 0000000..a4d01f0 Binary files /dev/null and b/external-libs/openssl/lib/arm64-v8a/libcrypto.a differ diff --git a/external-libs/openssl/lib/arm64-v8a/libssl.a b/external-libs/openssl/lib/arm64-v8a/libssl.a new file mode 100644 index 0000000..c483418 Binary files /dev/null and b/external-libs/openssl/lib/arm64-v8a/libssl.a differ diff --git a/external-libs/openssl/lib/armeabi-v7a/libcrypto.a b/external-libs/openssl/lib/armeabi-v7a/libcrypto.a index 27d94e2..8042fd9 100644 Binary files a/external-libs/openssl/lib/armeabi-v7a/libcrypto.a and b/external-libs/openssl/lib/armeabi-v7a/libcrypto.a differ diff --git a/external-libs/openssl/lib/armeabi-v7a/libssl.a b/external-libs/openssl/lib/armeabi-v7a/libssl.a index 7987e8d..0f59043 100644 Binary files a/external-libs/openssl/lib/armeabi-v7a/libssl.a and b/external-libs/openssl/lib/armeabi-v7a/libssl.a differ diff --git a/external-libs/openssl/lib/x86/libcrypto.a b/external-libs/openssl/lib/x86/libcrypto.a new file mode 100644 index 0000000..9a4ddff Binary files /dev/null and b/external-libs/openssl/lib/x86/libcrypto.a differ diff --git a/external-libs/openssl/lib/x86/libssl.a b/external-libs/openssl/lib/x86/libssl.a new file mode 100644 index 0000000..1487ee3 Binary files /dev/null and b/external-libs/openssl/lib/x86/libssl.a differ diff --git a/external-libs/openssl/lib/x86_64/libcrypto.a b/external-libs/openssl/lib/x86_64/libcrypto.a new file mode 100644 index 0000000..9a8d04f Binary files /dev/null and b/external-libs/openssl/lib/x86_64/libcrypto.a differ diff --git a/external-libs/openssl/lib/x86_64/libssl.a b/external-libs/openssl/lib/x86_64/libssl.a new file mode 100644 index 0000000..3b3c48d Binary files /dev/null and b/external-libs/openssl/lib/x86_64/libssl.a differ