mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-20 03:52:27 +02:00
Code

Upgrade build files to new versions

Browse Source
This commit is contained in:
Arne Schwabe 2021-06-15 16:41:56 +02:00
parent 26adf47d5f
commit 8e42e5cbc5
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -9,13 +9,13 @@ buildscript {
var fragment_version: String by extra var fragment_version: String by extra
kotlin_version = "1.4.32" kotlin_version = "1.4.32"
fragment_version = "1.3.2" fragment_version = "1.3.3"
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { 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") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

2
main/build.gradle.kts
View File

@ -35,7 +35,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path =File("${projectDir}/src/main/cpp/CMakeLists.txt") path = File("${projectDir}/src/main/cpp/CMakeLists.txt")
} }
} }

12
main/src/main/cpp/CMakeLists.txt
View File

@ -123,9 +123,6 @@ set(openvpn_srcs
src/compat/compat-daemon.c src/compat/compat-daemon.c
src/compat/compat-dirname.c src/compat/compat-dirname.c
src/compat/compat-gettimeofday.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/argv.c
src/openvpn/auth_token.c src/openvpn/auth_token.c
src/openvpn/base64.c src/openvpn/base64.c
@ -230,12 +227,12 @@ if (${OPENVPN2MBED})
target_compile_definitions(openvpn PRIVATE target_compile_definitions(openvpn PRIVATE
-DENABLE_CRYPTO_MBEDTLS=1 -DENABLE_CRYPTO_MBEDTLS=1
) )
target_link_libraries(openvpn mbedtls mbedx509 mbedcrypto lzo) target_link_libraries(openvpn mbedtls mbedx509 mbedcrypto lzo lz4)
else () else ()
target_compile_definitions(openvpn PRIVATE target_compile_definitions(openvpn PRIVATE
-DENABLE_CRYPTO_OPENSSL=1 -DENABLE_CRYPTO_OPENSSL=1
) )
target_link_libraries(openvpn crypto ssl lzo) target_link_libraries(openvpn crypto ssl lzo lz4)
endif () endif ()
add_executable(libovpnexec.so minivpn/minivpn.c) 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 add_custom_target(makeassetdir ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${OVPN_ASSET_DIR}) COMMAND ${CMAKE_COMMAND} -E make_directory ${OVPN_ASSET_DIR})
add_custom_command(TARGET nopie_openvpn.${ANDROID_ABI} POST_BUILD add_custom_command(TARGET nopie_openvpn.${ANDROID_ABI} POST_BUILD
COMMAND COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/nopie_openvpn.${ANDROID_ABI} $<TARGET_FILE:nopie_openvpn.${ANDROID_ABI}>
${OVPN_ASSET_DIR} ${OVPN_ASSET_DIR}
) )
add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD
COMMAND COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/pie_openvpn.${ANDROID_ABI} $<TARGET_FILE:pie_openvpn.${ANDROID_ABI}>
${OVPN_ASSET_DIR} ${OVPN_ASSET_DIR}
) )

4
remoteExample/build.gradle
View File

@ -7,11 +7,11 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 28 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 28 targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }

2
settings.gradle.kts
View File

@ -6,4 +6,4 @@
include(":main") include(":main")
include(":tlsexternalcertprovider") include(":tlsexternalcertprovider")
include(":remoteExample") include(":remoteExample")
include(":yubikeyplugin") //include(":yubikeyplugin")