diff options
| author | cyberta <cyberta@riseup.net> | 2022-07-19 17:26:25 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-07-19 17:26:25 +0000 |
| commit | 6bc3a79e6d09a8fa1857f1d502a87c1c0633be35 (patch) | |
| tree | 7aa914e63bb6aae27c8521dd198e3f7416e9890c /scripts/build_deps.sh | |
| parent | abd8c8d06f01cc5b794a18779c2ea36b9317b4e3 (diff) | |
| parent | 4a95fbad79333bc1cc83b22c8122293a3d8d332f (diff) | |
Merge branch 'integrate_obfsvpn' into 'master'
update bitmaskcore, integrating obfsvpn
See merge request leap/bitmask_android!190
Diffstat (limited to 'scripts/build_deps.sh')
| -rwxr-xr-x | scripts/build_deps.sh | 8 |
1 files changed, 5 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" |