diff options
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rwxr-xr-x | build_deps.sh | 2 | ||||
| -rwxr-xr-x | go/install_go.sh | 4 | ||||
| m--------- | ics-openvpn | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle index 34111828..6c236669 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -213,7 +213,7 @@ android { '../ics-openvpn/main/build/ovpnassets', // '../go/out' TODO: uncomment this line as soon as we want to use PT in production ] - jniLibs.srcDirs = ['../ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj'] + jniLibs.srcDirs = ['../ics-openvpn/main/build/intermediates/cmake/skeletonRelease/obj/'] jni.srcDirs = [] //disable automatic ndk-build } debug { diff --git a/build_deps.sh b/build_deps.sh index 9933709b..156f5300 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -21,7 +21,7 @@ then else echo "Clean build: starting externalNativeBuild and GO dependency builds" cd ./ics-openvpn || quit "Directory ics-opevpn not found" - ./gradlew clean main:externalNativeBuildCleanNoovpn3Release main:externalNativeBuildNoovpn3Release --debug --stacktrace || quit "Build ics-openvpn native libraries failed" + ./gradlew clean main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease --debug --stacktrace || quit "Build ics-openvpn native libraries failed" cd .. fi diff --git a/go/install_go.sh b/go/install_go.sh index 8631b456..59aab4f0 100755 --- a/go/install_go.sh +++ b/go/install_go.sh @@ -1,7 +1,7 @@ #!/bin/bash -GO_VERSION=go1.12.7.linux-amd64 -EXPECTED_FP=66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9 +GO_VERSION=go1.14.2.linux-amd64 +EXPECTED_FP=6272d6e940ecb71ea5636ddb5fab3933e087c1356173c61f4a803895e947ebb3 if [[ $(ls -A ${GO_VERSION}.tar.gz) ]] then diff --git a/ics-openvpn b/ics-openvpn -Subproject 24e914e68ba6c456ee3f8b352d41236c9475977 +Subproject 446814e65e2f7ad8ba544d020a5ddce9d2e3723 |