diff options
| author | cyBerta <cyberta@riseup.net> | 2019-07-29 18:49:52 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2019-08-02 01:49:37 +0200 |
| commit | 8d0a10f8ca92de4766aee8d41f3e235590c3a848 (patch) | |
| tree | 7c728357b8cd95e5de94cf7ae5a23812a99212af /build_deps.sh | |
| parent | 4f7455bb6ea37928bd44d8579deaa05402975bc5 (diff) | |
update shapeshifter lib build script using gomobile
Diffstat (limited to 'build_deps.sh')
| -rwxr-xr-x | build_deps.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/build_deps.sh b/build_deps.sh index b95475a3..7f0c8e89 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -8,8 +8,7 @@ function quit { DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj -DIR_GOLANG=./go/golang/ -DIR_SHAPESHIFTER_DISPATCHER=./go/src/ +DIR_GOLIBS=./go/lib/ FILE_X86=./go/out/x86/piedispatcherlib FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib @@ -26,13 +25,13 @@ else cd .. fi -if [[ $(ls -A ${FILE_X86}) && $(ls -A ${FILE_ARM}) ]] +if [[ $(ls -A ${DIR_GOLIBS}) ]] then echo "Dirty build: Reusing go libraries" else echo "Clean build: compiling Go libraries" cd ./go || quit "Directory go not found" - ./android_build_shapeshifter.sh clean || quit "android_build_shapeshifter_dispatcher.sh clean failed" ./install_go.sh || quit "install_go.sh failed" - ./android_build_shapeshifter.sh --library || quit "android_build_shapeshifter_dispatcher.sh failed" + ./android_build_shapeshifter_lib.sh || quit "android_build_shapeshifter_dispatcher.sh failed" + cd .. fi |