From a3291289b1c77410f569a10ff2f38f4c6ff0c1b5 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 13 Jun 2024 08:02:25 +0200 Subject: [PATCH] rename target --- .../jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so | 2 +- .../jniLibs/armeabi-v7a/libwownero_libwallet2_api_c.so | 2 +- scripts/android/build_monero_all.sh | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so index ea65fc4f9..c0d56dd3b 120000 --- a/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so +++ b/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so @@ -1 +1 @@ -../../../../../../scripts/monero_c/release/monero/arm-linux-androideabi_libwallet2_api_c.so \ No newline at end of file +../../../../../../scripts/monero_c/release/monero/armv7a-linux-androideabi_libwallet2_api_c.so \ No newline at end of file diff --git a/android/app/src/main/jniLibs/armeabi-v7a/libwownero_libwallet2_api_c.so b/android/app/src/main/jniLibs/armeabi-v7a/libwownero_libwallet2_api_c.so index e7eed229e..5a71e87b1 120000 --- a/android/app/src/main/jniLibs/armeabi-v7a/libwownero_libwallet2_api_c.so +++ b/android/app/src/main/jniLibs/armeabi-v7a/libwownero_libwallet2_api_c.so @@ -1 +1 @@ -../../../../../../scripts/monero_c/release/wownero/arm-linux-androideabi_libwallet2_api_c.so \ No newline at end of file +../../../../../../scripts/monero_c/release/wownero/armv7a-linux-androideabi_libwallet2_api_c.so \ No newline at end of file diff --git a/scripts/android/build_monero_all.sh b/scripts/android/build_monero_all.sh index 4c265597f..58e9f70e1 100755 --- a/scripts/android/build_monero_all.sh +++ b/scripts/android/build_monero_all.sh @@ -29,7 +29,7 @@ then pushd ../monero_c docker run --platform linux/amd64 -v$HOME/.cache/ccache:/root/.ccache -v$PWD:$PWD -w $PWD --rm -it git.mrcyjanek.net/mrcyjanek/debian:buster bash -c "git config --global --add safe.directory '*'; apt update; apt install -y ccache gcc g++ libtinfo5 gperf; ./build_single.sh ${COIN} x86_64-linux-android $NPROC" # docker run --platform linux/amd64 -v$PWD:$PWD -w $PWD --rm -it git.mrcyjanek.net/mrcyjanek/debian:buster bash -c "git config --global --add safe.directory '*'; apt update; apt install -y ccache gcc g++ libtinfo5 gperf; ./build_single.sh ${COIN} i686-linux-android $NPROC" - docker run --platform linux/amd64 -v$HOME/.cache/ccache:/root/.ccache -v$PWD:$PWD -w $PWD --rm -it git.mrcyjanek.net/mrcyjanek/debian:buster bash -c "git config --global --add safe.directory '*'; apt update; apt install -y ccache gcc g++ libtinfo5 gperf; ./build_single.sh ${COIN} arm-linux-androideabi $NPROC" + docker run --platform linux/amd64 -v$HOME/.cache/ccache:/root/.ccache -v$PWD:$PWD -w $PWD --rm -it git.mrcyjanek.net/mrcyjanek/debian:buster bash -c "git config --global --add safe.directory '*'; apt update; apt install -y ccache gcc g++ libtinfo5 gperf; ./build_single.sh ${COIN} armv7a-linux-androideabi $NPROC" docker run --platform linux/amd64 -v$HOME/.cache/ccache:/root/.ccache -v$PWD:$PWD -w $PWD --rm -it git.mrcyjanek.net/mrcyjanek/debian:buster bash -c "git config --global --add safe.directory '*'; apt update; apt install -y ccache gcc g++ libtinfo5 gperf; ./build_single.sh ${COIN} aarch64-linux-android $NPROC" popd done @@ -41,8 +41,8 @@ else [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/x86_64-linux-android # ./build_single.sh ${COIN} i686-linux-android $NPROC # [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/i686-linux-android - ./build_single.sh ${COIN} arm-linux-androideabi $NPROC - [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/arm-linux-androideabi + ./build_single.sh ${COIN} armv7a-linux-androideabi $NPROC + [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/armv7a-linux-androideabi ./build_single.sh ${COIN} aarch64-linux-android $NPROC [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/aarch64-linux-android @@ -50,8 +50,8 @@ else unxz -f ../monero_c/release/${COIN}/x86_64-linux-android_libwallet2_api_c.so.xz unxz -f ../monero_c/release/${COIN}/x86_64-linux-android_libc++_shared.so.xz - unxz -f ../monero_c/release/${COIN}/arm-linux-androideabi_libwallet2_api_c.so.xz - unxz -f ../monero_c/release/${COIN}/arm-linux-androideabi_libc++_shared.so.xz + unxz -f ../monero_c/release/${COIN}/armv7a-linux-androideabi_libwallet2_api_c.so.xz + unxz -f ../monero_c/release/${COIN}/armv7a-linux-androideabi_libc++_shared.so.xz unxz -f ../monero_c/release/${COIN}/aarch64-linux-android_libwallet2_api_c.so.xz unxz -f ../monero_c/release/${COIN}/aarch64-linux-android_libc++_shared.so.xz