From c1c10348b60b974cfb10384d5230fb9da8a387bc Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 Sep 2023 17:26:20 +0100 Subject: [PATCH] Enable compilation of android-x86. --- build.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 02c86d2..1894ced 100755 --- a/build.sh +++ b/build.sh @@ -59,14 +59,16 @@ mv libAaru.Compression.Native.so runtimes/android-x64/native/ ## Android (x86) # Detected system processor: i686 -#rm -f CMakeCache.txt -#mkdir -p runtimes/android-x86/native -#docker run --rm dockcross/android-x86 >docker/dockcross-android-x86 -#chmod +x docker/dockcross-android-x86 -#docker/dockcross-android-x86 cmake -DCMAKE_BUILD_TYPE=Release -DAARU_BUILD_PACKAGE=1 . -#docker/dockcross-android-x86 make Aaru.Compression.Native -#docker/dockcross-android-x86 /usr/i686-linux-android/bin/llvm-strip -s -w -K "AARU*" libAaru.Compression.Native.so -#mv libAaru.Compression.Native.so runtimes/android-x86/native/ +rm -f CMakeCache.txt +mkdir -p runtimes/android-x86/native +docker run --rm dockcross/android-x86 >docker/dockcross-android-x86 +chmod +x docker/dockcross-android-x86 +docker/dockcross-android-x86 cmake -DCMAKE_BUILD_TYPE=Release -DAARU_BUILD_PACKAGE=1 . +sed -e 's/\-fuse-ld=gold//g' ./CMakeFiles/Aaru.Compression.Native.dir/link.txt > link.txt +mv link.txt ./CMakeFiles/Aaru.Compression.Native.dir/link.txt +docker/dockcross-android-x86 make Aaru.Compression.Native +docker/dockcross-android-x86 /usr/i686-linux-android/bin/llvm-strip -s -w -K "AARU*" libAaru.Compression.Native.so +mv libAaru.Compression.Native.so runtimes/android-x86/native/ ## Linux (ARMv7-A) # Detected system processor: arm