Fir for android build
M committed
Apr 1, 2022 at 13:50 UTC
61e87d3f6198c9b7646b374971c64962c3ebabdb
5 files changed
+12
-5
cw_haven/ios/Classes/haven_api.cpp
+1
-1
@@ -11,7 +11,7 @@
11
void __clear_cache(void* start, void* end) { }
12
#include "../External/ios/include/wallet2_api.h"
13
#else
14
-#include "../External/android/x86/include/wallet2_api.h"
14
+#include "../External/include/wallet2_api.h"
15
#endif
16
17
using namespace std::chrono_literals;
cw_monero/ios/Classes/monero_api.cpp
+1
-1
@@ -12,7 +12,7 @@
12
void __clear_cache(void* start, void* end) { }
13
#include "../External/ios/include/wallet2_api.h"
14
#else
15
-#include "../External/android/x86/include/wallet2_api.h"
15
+#include "../External/include/wallet2_api.h"
16
#endif
17
18
using namespace std::chrono_literals;
scripts/android/build_haven.sh
+1
-1
@@ -15,7 +15,7 @@ do
15
FLAGS=""
16
PREFIX=${WORKDIR}/prefix_${arch}
17
DEST_LIB_DIR=${PREFIX}/lib/haven
18
-DEST_INCLUDE_DIR=${PREFIX}/include
18
+DEST_INCLUDE_DIR=${PREFIX}/include/haven
19
export CMAKE_INCLUDE_PATH="${PREFIX}/include"
20
export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
21
ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"
scripts/android/build_monero.sh
+1
-1
@@ -14,7 +14,7 @@ do
14
FLAGS=""
15
PREFIX=${WORKDIR}/prefix_${arch}
16
DEST_LIB_DIR=${PREFIX}/lib/monero
17
-DEST_INCLUDE_DIR=${PREFIX}/include
17
+DEST_INCLUDE_DIR=${PREFIX}/include/monero
18
export CMAKE_INCLUDE_PATH="${PREFIX}/include"
19
export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
20
ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"
scripts/android/copy_monero_deps.sh
+8
-1
@@ -3,7 +3,8 @@
3
WORKDIR=/opt/android
4
CW_DIR=${WORKDIR}/cake_wallet
5
CW_EXRTERNAL_DIR=${CW_DIR}/cw_shared_external/ios/External/android
6
-
6
+CW_HAVEN_EXTERNAL_DIR=${CW_DIR}/cw_haven/ios/External
7
+CW_MONERO_EXTERNAL_DIR=${CW_DIR}/cw_monero/ios/External
8
for arch in "aarch" "aarch64" "i686" "x86_64"
9
do
10
@@ -32,3 +33,9 @@ cp -r ${PREFIX}/include/* $INCLUDE_DIR
33
34
35
done
36
+
37
+mkdir -p ${CW_HAVEN_EXTERNAL_DIR}/include
38
+mkdir -p ${CW_MONERO_EXTERNAL_DIR}/include
39
+
40
+cp $CW_EXRTERNAL_DIR/x86/include/monero/wallet2_api.h ${CW_MONERO_EXTERNAL_DIR}/include
41
+cp $CW_EXRTERNAL_DIR/x86/include/haven/wallet2_api.h ${CW_HAVEN_EXTERNAL_DIR}/include