aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Douma <nicolas@serveur.io>2019-10-04 16:58:58 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-10-12 18:55:28 +0200
commit783a1f219787ed637107ae876a9aebc0b5eba130 (patch)
tree9cd723d09d7188549f9d5dae7c5cca8a999055d1
parentActivity: make dark/night theme follow system on Q (diff)
downloadwireguard-android-783a1f219787ed637107ae876a9aebc0b5eba130.tar.xz
wireguard-android-783a1f219787ed637107ae876a9aebc0b5eba130.zip
tools: prepare for binder usage in wg-quick
Signed-off-by: Nicolas Douma <nicolas@serveur.io>
-rw-r--r--app/tools/CMakeLists.txt3
m---------app/tools/wireguard0
2 files changed, 2 insertions, 1 deletions
diff --git a/app/tools/CMakeLists.txt b/app/tools/CMakeLists.txt
index 41060ea..2a04901 100644
--- a/app/tools/CMakeLists.txt
+++ b/app/tools/CMakeLists.txt
@@ -9,7 +9,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
add_executable(libwg-quick.so wireguard/src/tools/wg-quick/android.c ndk-compat/compat.c)
-target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -pedantic -Wno-missing-field-initializers -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
+target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
+target_link_libraries(libwg-quick.so -ldl)
file(GLOB WG_SOURCES wireguard/src/tools/*.c libmnl/src/*.c ndk-compat/compat.c)
add_executable(libwg.so ${WG_SOURCES})
diff --git a/app/tools/wireguard b/app/tools/wireguard
-Subproject 44673f081248472022173c5c8b1edd5bb6a5954
+Subproject 8eb8443709cc7636c57ecb203acedc8e47bc772