diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2021-06-15 16:41:56 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2021-06-15 16:41:56 +0200 |
| commit | 8e42e5cbc54c820f2b39082289d7257413eeafc3 (patch) | |
| tree | db92cc43b00919f2a7da0e4a6dd96cbde86314d7 /main | |
| parent | 26adf47d5f25758c70881039c329ec709b619068 (diff) | |
Upgrade build files to new versions
Diffstat (limited to 'main')
| -rw-r--r-- | main/build.gradle.kts | 2 | ||||
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 12 |
2 files changed, 6 insertions, 8 deletions
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} ) |