From 6d410f65f1145fd69e9417a2a99e78581630d814 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 9 Jul 2021 04:03:23 +0200
Subject: build bitmaskcore in build_deps.sh

---
 scripts/build_deps.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 1785fca8..75fd52ea 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -9,7 +9,7 @@ SCRIPT_DIR=$(dirname "$0")
 BASE_DIR="$SCRIPT_DIR/.."
 DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets
 DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj
-DIR_GOLIBS=./go/lib/
+DIR_GOLIBS=./bitmaskcore/lib/
 FILE_X86=./go/out/x86/piedispatcherlib
 FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
 
@@ -32,9 +32,11 @@ then
     echo "Dirty build: Reusing go libraries"
 else
     echo "Clean build: compiling Go libraries"
-    cd ./go || quit "Directory go not found"
-    ./install_go.sh || quit "install_go.sh failed"
-    ./android_build_web_core.sh || quit "android_build_web_core.sh (shapeshifter + pgpverify) failed"
-    ./android_build_core.sh || quit "android build core (shapeshifter) failed"
+    cd ./bitmaskcore || quit "Directory go not found"
+    if [[ ! -d lib ]]
+    then
+        mkdir lib
+    fi
+    ./build_core.sh
     cd ..
 fi
-- 
cgit v1.2.3


From cdefcb0d109d4558d5b9531bde2178a8b9bad0dc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 9 Jul 2021 04:56:56 +0200
Subject: use bitmaskcore libs in android project

---
 scripts/build_deps.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 75fd52ea..1d8d26d5 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -37,6 +37,18 @@ else
     then
         mkdir lib
     fi
-    ./build_core.sh
-    cd ..
+    ./build_core.sh || quit "failed to build bitmaskcore"
+    cp lib/bitmaskcore.aar ../lib-bitmask-core/.
+    cp lib/bitmaskcore-sources.jar ../lib-bitmask-core/.
+    cp lib/bitmaskcore_web.aar ../lib-bitmask-core-web/.
+    cp lib/bitmaskcore_web-sources.jar ../lib-bitmask-core-web/.
+    cp lib/bitmaskcore_arm.aar ../lib-bitmask-core-armv7/.
+    cp lib/bitmaskcore_arm-sources.jar ../lib-bitmask-core-armv7/.
+    cp lib/bitmaskcore_arm64.aar ../lib-bitmask-core-arm64/.
+    cp lib/bitmaskcore_arm64-sources.jar ../lib-bitmask-core-arm64/.
+    cp lib/bitmaskcore_x86.aar ../lib-bitmask-core-x86/.
+    cp lib/bitmaskcore_x86-sources.jar ../lib-bitmask-core-x86/.
+    cp lib/bitmaskcore_x86_64.aar ../lib-bitmask-core-x86_64/.
+    cp lib/bitmaskcore_x86_64-sources.jar ../lib-bitmask-core-x86_64/.
+
 fi
-- 
cgit v1.2.3


From 0822d3e0f62d9dcc9c1ce15bea941860affbf94f Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 15 Jul 2021 00:36:00 +0200
Subject: build tor binaries from source

---
 scripts/build_deps.sh | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 1d8d26d5..fde8f878 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -10,9 +10,11 @@ BASE_DIR="$SCRIPT_DIR/.."
 DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets
 DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj
 DIR_GOLIBS=./bitmaskcore/lib/
-FILE_X86=./go/out/x86/piedispatcherlib
-FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
-
+#FILE_X86=./go/out/x86/piedispatcherlib
+#FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
+DIR_TORLIBS=./tor-android/external/lib
+NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
+EXPECTED_NDK_VERSION="21.4.7075529"
 # init
 # look for empty dir
 
@@ -51,4 +53,28 @@ else
     cp lib/bitmaskcore_x86_64.aar ../lib-bitmask-core-x86_64/.
     cp lib/bitmaskcore_x86_64-sources.jar ../lib-bitmask-core-x86_64/.
 
+    cd ..
 fi
+
+if [[ $(ls -A ${DIR_TORLIBS}) ]]
+then
+  echo "Dirty build: Reusing tor libraries"
+else
+  echo "Clean build: compiling tor libraries"
+  if [[ ! -d $DIR_TORLIBS ]]
+  then
+    mkdir $DIR_TORLIBS
+  fi
+
+  cd ./tor-android
+
+  if [[ $NDK_VERSION == $EXPECTED_NDK_VERSION ]]
+  then
+    ./tor-droid-make.sh fetch -c
+    ./tor-droid-make.sh build -b release
+  else
+    echo "expected NDK VERSION: $EXPECTED_NDK_VERSION. But found: $NDK_VERSION"
+  fi
+
+  cd ..
+fi
\ No newline at end of file
-- 
cgit v1.2.3


From 9b4c03d0f80a89d1a8ac79e204d3d417a04d79d4 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 15 Jul 2021 11:34:55 +0200
Subject: quit build process if tor cannot be build

---
 scripts/build_deps.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index fde8f878..7c0bfa74 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -70,10 +70,10 @@ else
 
   if [[ $NDK_VERSION == $EXPECTED_NDK_VERSION ]]
   then
-    ./tor-droid-make.sh fetch -c
-    ./tor-droid-make.sh build -b release
+    ./tor-droid-make.sh fetch -c || quit "failed to checkout tor dependencies"
+    ./tor-droid-make.sh build -b release || quit "failed to build tor release binaries"
   else
-    echo "expected NDK VERSION: $EXPECTED_NDK_VERSION. But found: $NDK_VERSION"
+    quit "expected NDK VERSION: $EXPECTED_NDK_VERSION. But found: $NDK_VERSION"
   fi
 
   cd ..
-- 
cgit v1.2.3


From 11e501a300e40bc254780723e39869c7830944eb Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 15 Jul 2021 11:51:31 +0200
Subject: check ndk version earlier, do first the tor binary build job

---
 scripts/build_deps.sh | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 7c0bfa74..e865bd49 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -19,6 +19,27 @@ EXPECTED_NDK_VERSION="21.4.7075529"
 # look for empty dir
 
 cd $BASE_DIR
+
+if [[ $(ls -A ${DIR_TORLIBS}) ]]
+then
+  echo "Dirty build: Reusing tor libraries"
+else
+  echo "Clean build: compiling tor libraries"
+  if [[ ! -d $DIR_TORLIBS ]]
+  then
+    mkdir $DIR_TORLIBS
+  fi
+  cd ./tor-android
+  if [[ $NDK_VERSION == $EXPECTED_NDK_VERSION ]]
+  then
+    ./tor-droid-make.sh fetch -c || quit "failed to checkout tor dependencies"
+    ./tor-droid-make.sh build -b release || quit "failed to build tor release binaries"
+  else
+    quit "expected NDK VERSION: $EXPECTED_NDK_VERSION. But found: $NDK_VERSION"
+  fi
+  cd ..
+fi
+
 if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]]
 then
     echo "Dirty build: skipped externalNativeBuild - reusing existing libs"
@@ -52,29 +73,5 @@ else
     cp lib/bitmaskcore_x86-sources.jar ../lib-bitmask-core-x86/.
     cp lib/bitmaskcore_x86_64.aar ../lib-bitmask-core-x86_64/.
     cp lib/bitmaskcore_x86_64-sources.jar ../lib-bitmask-core-x86_64/.
-
     cd ..
-fi
-
-if [[ $(ls -A ${DIR_TORLIBS}) ]]
-then
-  echo "Dirty build: Reusing tor libraries"
-else
-  echo "Clean build: compiling tor libraries"
-  if [[ ! -d $DIR_TORLIBS ]]
-  then
-    mkdir $DIR_TORLIBS
-  fi
-
-  cd ./tor-android
-
-  if [[ $NDK_VERSION == $EXPECTED_NDK_VERSION ]]
-  then
-    ./tor-droid-make.sh fetch -c || quit "failed to checkout tor dependencies"
-    ./tor-droid-make.sh build -b release || quit "failed to build tor release binaries"
-  else
-    quit "expected NDK VERSION: $EXPECTED_NDK_VERSION. But found: $NDK_VERSION"
-  fi
-
-  cd ..
 fi
\ No newline at end of file
-- 
cgit v1.2.3


From 7b7fa94ff24aa56faf5123e867c2206c2ca69852 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 15 Jul 2021 12:11:05 +0200
Subject: try to set ANDROID_NDK_HOME to expected NDK version

---
 scripts/build_deps.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index e865bd49..58ed65c5 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -13,13 +13,21 @@ DIR_GOLIBS=./bitmaskcore/lib/
 #FILE_X86=./go/out/x86/piedispatcherlib
 #FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
 DIR_TORLIBS=./tor-android/external/lib
-NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
 EXPECTED_NDK_VERSION="21.4.7075529"
 # init
 # look for empty dir
 
 cd $BASE_DIR
 
+# try to set the expected ndk version
+if [[ $(ls -A ${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}) ]]
+then
+  ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}
+fi
+NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
+
+
+# build tor libs
 if [[ $(ls -A ${DIR_TORLIBS}) ]]
 then
   echo "Dirty build: Reusing tor libraries"
@@ -40,6 +48,7 @@ else
   cd ..
 fi
 
+# build openvpn libs
 if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]]
 then
     echo "Dirty build: skipped externalNativeBuild - reusing existing libs"
@@ -50,6 +59,7 @@ else
     cd ..
 fi
 
+# build bitmask core (shapeshifter, snowflake, pgpverify)
 if [[ $(ls -A ${DIR_GOLIBS}) ]]
 then
     echo "Dirty build: Reusing go libraries"
-- 
cgit v1.2.3


From c3fd98026f52bcc801a5ed1212c61897a48e3b44 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 3 Aug 2021 01:38:43 +0200
Subject: fix ANDROID_NDK_HOME if ndk was manually downloaded

---
 scripts/build_deps.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 58ed65c5..eb731fcd 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -14,6 +14,8 @@ DIR_GOLIBS=./bitmaskcore/lib/
 #FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
 DIR_TORLIBS=./tor-android/external/lib
 EXPECTED_NDK_VERSION="21.4.7075529"
+EXPECTED_ANDROID_NDK_RELEASE_VERSION="r21e"
+
 # init
 # look for empty dir
 
@@ -23,6 +25,9 @@ cd $BASE_DIR
 if [[ $(ls -A ${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}) ]]
 then
   ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}
+else
+  # ndk was manually downloaded from http://dl.google.com/android/repository
+  ANDROID_NDK_HOME=${ANDROID_HOME}/android-ndk-${EXPECTED_ANDROID_NDK_RELEASE_VERSION}
 fi
 NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
 
-- 
cgit v1.2.3


From 4d4d14e45bbba8342d7c98a874e34069bf1350d8 Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Tue, 3 Aug 2021 07:09:29 +0200
Subject: add some more debug output

---
 scripts/build_deps.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index eb731fcd..5349cd63 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -29,8 +29,11 @@ else
   # ndk was manually downloaded from http://dl.google.com/android/repository
   ANDROID_NDK_HOME=${ANDROID_HOME}/android-ndk-${EXPECTED_ANDROID_NDK_RELEASE_VERSION}
 fi
-NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
+NDK_VERSION=`cat ${ANDROID_NDK_HOME}/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
 
+ls -la ${ANDROID_HOME}/*/*ndk*
+echo "ndk version: $NDK_VERSION"
+echo "ANDROID_NDK_HOME: $ANDROID_NDK_HOME"
 
 # build tor libs
 if [[ $(ls -A ${DIR_TORLIBS}) ]]
-- 
cgit v1.2.3


From 36c90a4f65c81dcb431662302ec175b2fb0840bd Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Wed, 4 Aug 2021 10:34:41 +0200
Subject: adapt debug output

---
 scripts/build_deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 5349cd63..470b39b6 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -31,7 +31,7 @@ else
 fi
 NDK_VERSION=`cat ${ANDROID_NDK_HOME}/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
 
-ls -la ${ANDROID_HOME}/*/*ndk*
+ls -la ${ANDROID_HOME}/*/*ndk
 echo "ndk version: $NDK_VERSION"
 echo "ANDROID_NDK_HOME: $ANDROID_NDK_HOME"
 
-- 
cgit v1.2.3