From d0d24f4554812c7d6a91785a6190791e02e6e56c Mon Sep 17 00:00:00 2001 From: Nicolas Douma Date: Fri, 4 Oct 2019 16:58:58 +0200 Subject: [PATCH] tools: prepare for binder usage in wg-quick Signed-off-by: Nicolas Douma Signed-off-by: Jason A. Donenfeld --- app/tools/CMakeLists.txt | 3 ++- app/tools/wireguard | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/tools/CMakeLists.txt b/app/tools/CMakeLists.txt index 41060ea1..2a04901f 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 index 44673f08..8eb84437 160000 --- a/app/tools/wireguard +++ b/app/tools/wireguard @@ -1 +1 @@ -Subproject commit 44673f081248472022173c5c8b1edd5bb6a59544 +Subproject commit 8eb8443709cc7636c57ecb203acedc8e47bc772e