diff options
| -rw-r--r-- | build.gradle.kts | 4 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | main/build.gradle.kts | 2 | ||||
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | remoteExample/build.gradle | 4 | ||||
| -rw-r--r-- | settings.gradle.kts | 2 |
6 files changed, 12 insertions, 14 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 75144b16..e0757aa0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,13 +9,13 @@ buildscript { var fragment_version: String by extra kotlin_version = "1.4.32" - fragment_version = "1.3.2" + fragment_version = "1.3.3" repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.1.3") + classpath("com.android.tools.build:gradle:4.2.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0d9f2b1..e18612e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip diff --git a/main/build.gradle.kts b/main/build.gradle.kts index b9e98bbf..79d9f269 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -35,7 +35,7 @@ android { externalNativeBuild { cmake { - path =File("${projectDir}/src/main/cpp/CMakeLists.txt") + path = File("${projectDir}/src/main/cpp/CMakeLists.txt") } } diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt index 52c38113..e06c76ac 100644 --- a/main/src/main/cpp/CMakeLists.txt +++ b/main/src/main/cpp/CMakeLists.txt @@ -123,9 +123,6 @@ set(openvpn_srcs src/compat/compat-daemon.c src/compat/compat-dirname.c src/compat/compat-gettimeofday.c - src/compat/compat-inet_ntop.c - src/compat/compat-inet_pton.c - src/compat/compat-lz4.c src/openvpn/argv.c src/openvpn/auth_token.c src/openvpn/base64.c @@ -230,12 +227,12 @@ if (${OPENVPN2MBED}) target_compile_definitions(openvpn PRIVATE -DENABLE_CRYPTO_MBEDTLS=1 ) - target_link_libraries(openvpn mbedtls mbedx509 mbedcrypto lzo) + target_link_libraries(openvpn mbedtls mbedx509 mbedcrypto lzo lz4) else () target_compile_definitions(openvpn PRIVATE -DENABLE_CRYPTO_OPENSSL=1 ) - target_link_libraries(openvpn crypto ssl lzo) + target_link_libraries(openvpn crypto ssl lzo lz4) endif () add_executable(libovpnexec.so minivpn/minivpn.c) @@ -255,17 +252,18 @@ SET(OVPN_ASSET_DIR ${CMAKE_SOURCE_DIR}/../../../build/ovpnassets) add_custom_target(makeassetdir ALL COMMAND ${CMAKE_COMMAND} -E make_directory ${OVPN_ASSET_DIR}) + add_custom_command(TARGET nopie_openvpn.${ANDROID_ABI} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_BINARY_DIR}/nopie_openvpn.${ANDROID_ABI} + $<TARGET_FILE:nopie_openvpn.${ANDROID_ABI}> ${OVPN_ASSET_DIR} ) add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_BINARY_DIR}/pie_openvpn.${ANDROID_ABI} + $<TARGET_FILE:pie_openvpn.${ANDROID_ABI}> ${OVPN_ASSET_DIR} ) diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle index bd758bd2..453dd529 100644 --- a/remoteExample/build.gradle +++ b/remoteExample/build.gradle @@ -7,11 +7,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 5e47f404..b4b170fe 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,4 +6,4 @@ include(":main") include(":tlsexternalcertprovider") include(":remoteExample") -include(":yubikeyplugin")
\ No newline at end of file +//include(":yubikeyplugin")
\ No newline at end of file |