summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-07-09 04:03:23 +0200
committercyBerta <cyberta@riseup.net>2021-07-21 22:02:24 +0200
commit6d410f65f1145fd69e9417a2a99e78581630d814 (patch)
treeef3ef75716d64314698dfcf18bb2b1d4f4343959 /scripts
parenteb0d4f9877e3332124ece92646deabf908d9763c (diff)
build bitmaskcore in build_deps.sh
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_deps.sh12
1 files changed, 7 insertions, 5 deletions
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