diff --git a/cw_haven/ios/Classes/haven_api.cpp b/cw_haven/ios/Classes/haven_api.cpp index 39d834cec..9b90e6063 100644 --- a/cw_haven/ios/Classes/haven_api.cpp +++ b/cw_haven/ios/Classes/haven_api.cpp @@ -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; diff --git a/cw_monero/ios/Classes/monero_api.cpp b/cw_monero/ios/Classes/monero_api.cpp index 9d52bdfe2..d0c0f4a6e 100644 --- a/cw_monero/ios/Classes/monero_api.cpp +++ b/cw_monero/ios/Classes/monero_api.cpp @@ -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; diff --git a/scripts/android/build_haven.sh b/scripts/android/build_haven.sh index dd303071d..6d22f7778 100755 --- a/scripts/android/build_haven.sh +++ b/scripts/android/build_haven.sh @@ -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}" diff --git a/scripts/android/build_monero.sh b/scripts/android/build_monero.sh index 5ea0a4987..0a9ce08ff 100755 --- a/scripts/android/build_monero.sh +++ b/scripts/android/build_monero.sh @@ -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}" diff --git a/scripts/android/copy_monero_deps.sh b/scripts/android/copy_monero_deps.sh index aa1c70fad..f951b9655 100755 --- a/scripts/android/copy_monero_deps.sh +++ b/scripts/android/copy_monero_deps.sh @@ -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