switch to bitmask-core-android

6 files changed, 8 insertions, 8 deletions

diff --git a/.gitmodules b/.gitmodules
index eb8fc432..98757f22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,9 +2,9 @@
 	path = ics-openvpn
 	branch = new_master
 	url =  https://leap.se/git/ics_openvpn.git
-[submodule "bitmaskcore"]
-	path = bitmaskcore
-	url = https://0xacab.org/leap/android_libs/bitmaskcore.git
 [submodule "tor-android"]
 	path = tor-android
 	url = https://0xacab.org/leap/android_libs/tor-android.git
+[submodule "bitmask-core-android"]
+	path = bitmask-core-android
+	url = https://0xacab.org/leap/android_libs/bitmask-core-android.git
diff --git a/bitmask-core-android b/bitmask-core-android
new file mode 160000
+Subproject b507cdb0e1f6ae2f22558103a50f35b261509f4
diff --git a/bitmaskcore b/bitmaskcore
deleted file mode 160000
-Subproject 22a1e72542372c8bc8a85f22aa883c2a33d9110
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 51cc926d..dd75ccae 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/skeletonRelease/obj
-DIR_GOLIBS=./bitmaskcore/lib/
+DIR_GOLIBS=./bitmask-core-android/lib/
 #FILE_X86=./go/out/x86/piedispatcherlib
 #FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
 DIR_TORLIBS=./tor-android/external/lib
@@ -82,12 +82,12 @@ then
     echo "Dirty build: Reusing go libraries"
 else
     echo "Clean build: compiling Go libraries"
-    cd ./bitmaskcore || quit "Directory go not found"
+    cd ./bitmask-core-android || quit "Directory go not found"
     if [[ ! -d lib ]]
     then
         mkdir lib
     fi
-    ./build_core.sh || quit "failed to build bitmaskcore"
+    ./build_core.sh || quit "Failed to build Bitmask Core Android"
     cp lib/bitmaskcore.aar ../lib-bitmask-core/.
     cp lib/bitmaskcore-sources.jar ../lib-bitmask-core/.
     cp lib/bitmaskcore_web.aar ../lib-bitmask-core-web/.
diff --git a/scripts/prepareForScreenshots.sh b/scripts/prepareForScreenshots.sh
index 0b38cfae..eba6f6a1 100755
--- a/scripts/prepareForScreenshots.sh
+++ b/scripts/prepareForScreenshots.sh
@@ -18,7 +18,7 @@
 SCRIPT_DIR=$(dirname "$0")
 BASE_DIR="$SCRIPT_DIR/.."
 
-rm -r $BASE_DIR/bitmaskcore/lib/*
+rm -r $BASE_DIR/bitmask-core-android/lib/*
 
 git checkout -- \*
 git checkout -- \.\*
diff --git a/scripts/prepareForTests.sh b/scripts/prepareForTests.sh
index d10a04b7..0a5ce709 100755
--- a/scripts/prepareForTests.sh
+++ b/scripts/prepareForTests.sh
@@ -20,7 +20,7 @@ BASE_DIR="$SCRIPT_DIR/.."
 
 git checkout -- \*
 git checkout -- \.\*
-rm -r $BASE_DIR/bitmaskcore/lib/*
+rm -r $BASE_DIR/bitmask-core-android/lib/*
 git submodule foreach --recursive git reset --hard HEAD
 git submodule sync --recursive
 git submodule update --init --recursive