From c2225bca3783adeb5a760a2e6119b6dc32dfef32 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 5 Feb 2021 10:28:31 +0100
Subject: [PATCH] try

---
 .../swig/build-android-arm.sh                 |  1 -
 frostwire-jlibtorrent/swig/build-utils.shinc  | 40 +++----------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/frostwire-jlibtorrent/swig/build-android-arm.sh b/frostwire-jlibtorrent/swig/build-android-arm.sh
index 09c182f..0b5619a 100755
--- a/frostwire-jlibtorrent/swig/build-android-arm.sh
+++ b/frostwire-jlibtorrent/swig/build-android-arm.sh
@@ -41,7 +41,6 @@ else
         prepare_boost
         prepare_openssl
         build_openssl
-        prepare_android_standalone_toolchain
         export CC=${ANDROID_TOOLCHAIN}/bin/armv7a-linux-androideabi${android_api}-clang++
         prepare_libtorrent
         ./run-swig.sh
diff --git a/frostwire-jlibtorrent/swig/build-utils.shinc b/frostwire-jlibtorrent/swig/build-utils.shinc
index b84accc..4414b3a 100644
--- a/frostwire-jlibtorrent/swig/build-utils.shinc
+++ b/frostwire-jlibtorrent/swig/build-utils.shinc
@@ -91,6 +91,7 @@ check_min_req_vars() {
 }
 
 prepare_boost() {
+  echo "***** PREPARE BOOST ******"
   abort_if_var_unset "BOOST_ROOT" ${BOOST_ROOT}
   abort_if_var_unset "BOOST_VERSION" ${BOOST_VERSION}
   abort_if_var_unset "BOOST_MAJOR" ${BOOST_MAJOR}
@@ -116,6 +117,7 @@ prepare_boost() {
   ./b2 /headers
   popd
   popd
+  echo "-------- PREPARE BOOST DONE --------"
 }
 
 download_android_ndk() {
@@ -140,7 +142,7 @@ prepare_android_toolchain() {
       host_os="darwin"
   fi
 
-  
+
   download_android_ndk
 
   export NDK=$PWD/android-ndk-${NDK_VERSION}
@@ -152,42 +154,9 @@ prepare_android_toolchain() {
   popd
 }
 
-prepare_android_standalone_toolchain() {
-  abort_if_var_unset "SRC" ${SRC}
-  abort_if_var_unset "NDK_VERSION" ${NDK_VERSION}
-  abort_if_var_unset "os_arch" ${os_arch}
-  abort_if_var_unset "android_api" ${android_api}
-  pushd ${SRC}
-
-  host_os="linux"
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-      host_os="darwin"
-  fi
-  
-  download_android_ndk
-
-  export NDK=$PWD/android-ndk-${NDK_VERSION}
-  prompt_msg "NDK=${NDK}"
-
-  if [ -d standalone_toolchain ]; then
-    rm -fr standalone_toolchain
-  fi
-
-  #try this command to get path of the prebuilt toolchain in the warnings
-  $NDK/build/tools/make_standalone_toolchain.py --arch ${os_arch} --api ${android_api} --stl libc++ --install-dir standalone_toolchain
-  #./build/tools/make_standalone_toolchain.py --arch x86 --api 21 --stl libc++ --install-dir standalone_toolchain
-  #./build/tools/make_standalone_toolchain.py --arch x86_64 --api 21 --stl libc++ --install-dir standalone_toolchain
-  #./build/tools/make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir standalone_toolchain
-  #./build/tools/make_standalone_toolchain.py --arch arm64 --api 21 --stl libc++ --install-dir standalone_toolchain
-
-  # Use the standalone toolchain path
-  export ANDROID_TOOLCHAIN=${PWD}/standalone_toolchain
-  prompt_msg "prepare_android_standalone_toolchain: ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN}"
-  popd
-}
-
 
 prepare_openssl() {
+  echo "***** PREPARE OPENSSL ******"
   abort_if_var_unset "SRC" ${SRC}
   abort_if_var_unset "OPENSSL_VERSION" ${OPENSSL_VERSION}
   abort_if_var_unset "OPENSSL_SOURCE" ${OPENSSL_SOURCE}
@@ -200,6 +169,7 @@ prepare_openssl() {
     rm -f openssl.tar.gz
     popd
   fi
+  echo "----- PREPARE OPENSSL DONE -----"
 }
 
 build_openssl() {