diff options
| author | cyberta <cyberta@riseup.net> | 2020-12-28 14:11:55 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2020-12-28 14:11:55 -0800 |
| commit | f2056a9f469c09f9d2deaad25c4a9b71275e5140 (patch) | |
| tree | 60a0053cfea3fbbfa24a168bba784f541c4e093c /build_deps.sh | |
| parent | 3485971b9fc2e4602f7f4482b4b3a44e9e683efa (diff) | |
| parent | 13a495d18917f9b8952088b4a3e960239c5a168c (diff) | |
Merge branch 'automatic_updates_for_web_apks' into 'master'
Automatic updates for web apks
Closes #8960
See merge request leap/bitmask_android!115
Diffstat (limited to 'build_deps.sh')
| -rwxr-xr-x | build_deps.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_deps.sh b/build_deps.sh index 156f5300..beb5e13e 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -19,7 +19,7 @@ if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]] then echo "Dirty build: skipped externalNativeBuild - reusing existing libs" else - echo "Clean build: starting externalNativeBuild and GO dependency builds" + echo "Clean build: starting externalNativeBuild" cd ./ics-openvpn || quit "Directory ics-opevpn not found" ./gradlew clean main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease --debug --stacktrace || quit "Build ics-openvpn native libraries failed" cd .. @@ -32,6 +32,7 @@ else echo "Clean build: compiling Go libraries" cd ./go || quit "Directory go not found" ./install_go.sh || quit "install_go.sh failed" - ./android_build_shapeshifter.sh createLibrary || quit "android_build_shapeshifter_dispatcher.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 .. fi |