Merge branch 'integrate_obfsvpn' into 'master'

update bitmaskcore, integrating obfsvpn

See merge request leap/bitmask_android!190

2 files changed, 33 insertions, 3 deletions

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 83fed5e8..14d2bafc 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -15,7 +15,8 @@ DIR_GOLIBS=./bitmaskcore/lib/
 DIR_TORLIBS=./tor-android/external/lib
 EXPECTED_NDK_VERSION="21.4.7075529"
 EXPECTED_ANDROID_NDK_RELEASE_VERSION="r21e"
-BUILD_TOR=true
+if [[ -z $BUILD_TOR ]]; then BUILD_TOR=true; fi
+if [[ -z $BUILD_OPENVPN_LIBS ]]; then BUILD_OPENVPN_LIBS=true; fi
 
 # init
 # look for empty dir
@@ -60,8 +61,9 @@ else
 fi
 
 # build openvpn libs
-if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]]
-then
+if [[ ${BUILD_OPENVPN_LIBS} == false ]]; then
+  echo "skipping openvpn"
+elif [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]]; then
     echo "Dirty build: skipped externalNativeBuild - reusing existing libs"
 else
     echo "Clean build: starting externalNativeBuild"
diff --git a/scripts/prepareForTests.sh b/scripts/prepareForTests.sh
new file mode 100755
index 00000000..d10a04b7
--- /dev/null
+++ b/scripts/prepareForTests.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Copyright (c) 2022 LEAP Encryption Access Project and contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+SCRIPT_DIR=$(dirname "$0")
+BASE_DIR="$SCRIPT_DIR/.."
+
+git checkout -- \*
+git checkout -- \.\*
+rm -r $BASE_DIR/bitmaskcore/lib/*
+git submodule foreach --recursive git reset --hard HEAD
+git submodule sync --recursive
+git submodule update --init --recursive
+
+BUILD_TOR=false BUILD_OPENVPN_LIBS=false ./scripts/build_deps.sh
\ No newline at end of file