Fir for android build

This commit is contained in:
M 2022-04-01 13:50:33 +01:00
parent d4b59d97de
commit 61e87d3f61
5 changed files with 12 additions and 5 deletions
cw_haven/ios/Classes
cw_monero/ios/Classes
scripts/android

View file

@ -11,7 +11,7 @@
void __clear_cache(void* start, void* end) { }
#include "../External/ios/include/wallet2_api.h"
#else
#include "../External/android/x86/include/wallet2_api.h"
#include "../External/include/wallet2_api.h"
#endif
using namespace std::chrono_literals;

View file

@ -12,7 +12,7 @@
void __clear_cache(void* start, void* end) { }
#include "../External/ios/include/wallet2_api.h"
#else
#include "../External/android/x86/include/wallet2_api.h"
#include "../External/include/wallet2_api.h"
#endif
using namespace std::chrono_literals;

View file

@ -15,7 +15,7 @@ do
FLAGS=""
PREFIX=${WORKDIR}/prefix_${arch}
DEST_LIB_DIR=${PREFIX}/lib/haven
DEST_INCLUDE_DIR=${PREFIX}/include
DEST_INCLUDE_DIR=${PREFIX}/include/haven
export CMAKE_INCLUDE_PATH="${PREFIX}/include"
export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"

View file

@ -14,7 +14,7 @@ do
FLAGS=""
PREFIX=${WORKDIR}/prefix_${arch}
DEST_LIB_DIR=${PREFIX}/lib/monero
DEST_INCLUDE_DIR=${PREFIX}/include
DEST_INCLUDE_DIR=${PREFIX}/include/monero
export CMAKE_INCLUDE_PATH="${PREFIX}/include"
export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"

View file

@ -3,7 +3,8 @@
WORKDIR=/opt/android
CW_DIR=${WORKDIR}/cake_wallet
CW_EXRTERNAL_DIR=${CW_DIR}/cw_shared_external/ios/External/android
CW_HAVEN_EXTERNAL_DIR=${CW_DIR}/cw_haven/ios/External
CW_MONERO_EXTERNAL_DIR=${CW_DIR}/cw_monero/ios/External
for arch in "aarch" "aarch64" "i686" "x86_64"
do
@ -32,3 +33,9 @@ cp -r ${PREFIX}/include/* $INCLUDE_DIR
done
mkdir -p ${CW_HAVEN_EXTERNAL_DIR}/include
mkdir -p ${CW_MONERO_EXTERNAL_DIR}/include
cp $CW_EXRTERNAL_DIR/x86/include/monero/wallet2_api.h ${CW_MONERO_EXTERNAL_DIR}/include
cp $CW_EXRTERNAL_DIR/x86/include/haven/wallet2_api.h ${CW_HAVEN_EXTERNAL_DIR}/include