Fix build instructionsHEADmaster

7 files changed, 19 insertions, 34 deletions

diff --git a/README.md b/README.md
index a76db172a5..239b7be2b4 100644
--- a/README.md
+++ b/README.md
@@ -6,21 +6,23 @@ build for arm CPUs.
 
 ## Build instructions
 
+Note: You might need an old system like Debian buster to build.
+It might also be necessary to install 32-bit versions of some libraries:
+
+    dpkg --add-architecture i386
+	apt update
+    apt install libc6:i386 libncurses5:i386 libstdc++6:i386
+
 Run
 
 ```
-./android-node-v8/taler-android-build/build-android-v8 $NDK $ARCH
-./andiroid-node-v8/taler-android-build/build-android-node $NDK $ARCH
+./taler-android-build/arm $NDK
+./taler-android-build/arm64 $NDK
+./taler-android-build/x86 $NDK
+./taler-android-build/x64 $NDK
 ```
 
 where `$NDK` is the path to the ndk-bundle in the Android SDK.
 
-where `$ARCH` is the the architecture of the supported devices:
-
- * arm
- * x86
- * x86_64
-
-
-This scripts are tested with NDK=19.2.5345600 and ARCH=arm version:
+These scripts are tested with arm and NDK version 19.2.5345600.
 
diff --git a/taler-android-build/arm b/taler-android-build/arm
index 69c130054a..c1f7b31b91 100755
--- a/taler-android-build/arm
+++ b/taler-android-build/arm
@@ -28,7 +28,7 @@ fi
 ./build-android-v8 "$NDK" arm
 
 cd $scriptdir/..
-x=$scriptdir/compiled/armeabi-v7a/
+x=$scriptdir/../../compiled/armeabi-v7a/
 mkdir -p $x
 cp deps/v8/out.gn/android-arm/*.so $x/
 
@@ -57,6 +57,5 @@ export CXXFLAGS='-D_LIBCPP_HAS_NO_OFF_T_FUNCTIONS'
 ./build-android-node "$1" arm
 
 cd $scriptdir/..
-x=$scriptdir/compiled/armeabi-v7a/
 mkdir -p $x
 cp out/Release/lib/libnode.so $x/
diff --git a/taler-android-build/arm64 b/taler-android-build/arm64
index 31bf46c13a..93dceec999 100755
--- a/taler-android-build/arm64
+++ b/taler-android-build/arm64
@@ -28,7 +28,7 @@ fi
 ./build-android-v8 "$1" arm64
 
 cd $scriptdir/..
-x=$scriptdir/compiled/arm64-v8a/
+x=$scriptdir/../../compiled/arm64-v8a/
 mkdir -p $x
 cp deps/v8/out.gn/android-arm64/*.so $x/
 
@@ -56,6 +56,5 @@ cd $scriptdir
 ./build-android-node "$1" arm64
 
 cd $scriptdir/..
-x=$scriptdir/compiled/arm64-v8a/
 mkdir -p $x
 cp out/Release/lib/libnode.so $x/
diff --git a/taler-android-build/build-android-node b/taler-android-build/build-android-node
index df92071bc2..5463ce9697 100755
--- a/taler-android-build/build-android-node
+++ b/taler-android-build/build-android-node
@@ -2,20 +2,6 @@
 
 # This script assumes that all the right environment variables
 # (CC, LD, STRIP, ...) areset.
-NDK=$1
-
-DEST_CPU_ARCH=$2
-API_LEVEL=26
-BUILD_HOST_TAG='linux-x86_64'
-TOOLCHAIN_DIR=$NDK/toolchains/llvm/prebuilt/$BUILD_HOST_TAG/
-
-export AR=$TOOLCHAIN_DIR/bin/arm-linux-androideabi-ar
-export CC=$TOOLCHAIN_DIR/bin/armv7a-linux-androideabi$API_LEVEL-clang
-export CXX=$TOOLCHAIN_DIR/bin/armv7a-linux-androideabi$API_LEVEL-clang++
-export LD=$TOOLCHAIN_DIR/bin/arm-linux-androideabi-ld
-export LINK=$TOOLCHAIN_DIR/bin/armv7a-linux-androideabi$API_LEVEL-clang++
-export RANLIB=$TOOLCHAIN_DIR/bin/arm-linux-androideabi-ranlib
-export STRIP=$TOOLCHAIN_DIR/bin/arm-linux-androideabi-strip
 
 set -eu -o pipefail
 
@@ -36,7 +22,7 @@ function myconf() {
       --shared
 }
 
+PATH="$PATH:./deps/v8/_depot_tools"
+
 myconf && make
 
-mkdir -p taler-android-build/compiled/
-cp deps/v8/out.gn/*/*.so taler-android-build/compiled/
diff --git a/taler-android-build/build-android-v8 b/taler-android-build/build-android-v8
index 70057b9c5e..b3f4d68887 100755
--- a/taler-android-build/build-android-v8
+++ b/taler-android-build/build-android-v8
@@ -13,6 +13,7 @@ if [[ ! -d "$NDK" ]]; then
   exit 1
 fi
 
+rm ./deps/v8/third_party/android_ndk
 ln -fs $NDK ./deps/v8/third_party/android_ndk
 
 # We do not export anything about the tool chain, as v8
diff --git a/taler-android-build/x64 b/taler-android-build/x64
index 22002bdd3e..7ede234961 100755
--- a/taler-android-build/x64
+++ b/taler-android-build/x64
@@ -28,7 +28,7 @@ fi
 ./build-android-v8 "$NDK" x64
 
 cd $scriptdir/..
-x=$scriptdir/compiled/x86_64/
+x=$scriptdir/../../compiled/x86_64/
 mkdir -p $x
 cp deps/v8/out.gn/android-x64/*.so $x/
 
@@ -55,6 +55,5 @@ export CXX=$TOOLCHAIN_DIR/bin/x86_64-linux-android$API_LEVEL-clang++
 ./build-android-node "$1" x64
 
 cd $scriptdir/..
-x=$scriptdir/compiled/x86_64/
 mkdir -p $x
 cp out/Release/lib/libnode.so $x/
diff --git a/taler-android-build/x86 b/taler-android-build/x86
index f1a5d582d6..aa84a37ca0 100755
--- a/taler-android-build/x86
+++ b/taler-android-build/x86
@@ -28,7 +28,7 @@ fi
 ./build-android-v8 "$NDK" x86
 
 cd $scriptdir/..
-x=$scriptdir/compiled/x86/
+x=$scriptdir/../../compiled/x86/
 mkdir -p $x
 cp deps/v8/out.gn/android-x86/*.so $x/
 
@@ -57,6 +57,5 @@ export CXXFLAGS='-D_LIBCPP_HAS_NO_OFF_T_FUNCTIONS'
 ./build-android-node "$1" x86
 
 cd $scriptdir/..
-x=$scriptdir/compiled/x86/
 mkdir -p $x
 cp out/Release/lib/libnode.so $x/