diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-12-26 14:21:40 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-12-27 16:49:30 +0100 |
| commit | 0a89c871902f9e9068351dcba148228b2f4aae36 (patch) | |
| tree | 4b0444ac934a58ab98aed206966abb9d0fde7be5 | |
| parent | a7df92a64c634913f79a7d2f32c25c3ef7a026b7 (diff) | |
tools: bump to new wireguard-tools repo
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | app/tools/CMakeLists.txt | 7 | ||||
| m--------- | app/tools/wireguard | 0 | ||||
| m--------- | app/tools/wireguard-tools | 0 |
4 files changed, 7 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 32ab0d51..03e09f61 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "app/tools/libmnl"] path = app/tools/libmnl url = https://git.netfilter.org/libmnl/ -[submodule "app/tools/wireguard"] - path = app/tools/wireguard - url = https://git.zx2c4.com/WireGuard +[submodule "app/tools/wireguard-tools"] + path = app/tools/wireguard-tools + url = https://git.zx2c4.com/wireguard-tools diff --git a/app/tools/CMakeLists.txt b/app/tools/CMakeLists.txt index 2a04901f..36a614bd 100644 --- a/app/tools/CMakeLists.txt +++ b/app/tools/CMakeLists.txt @@ -8,13 +8,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # Work around https://github.com/android-ndk/ndk/issues/602 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) +add_executable(libwg-quick.so wireguard-tools/src/wg-quick/android.c ndk-compat/compat.c) 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) +file(GLOB WG_SOURCES wireguard-tools/src/*.c libmnl/src/*.c ndk-compat/compat.c) add_executable(libwg.so ${WG_SOURCES}) -target_compile_options(libwg.so PUBLIC -idirafter "${CMAKE_CURRENT_SOURCE_DIR}/libmnl/include/" -I "${CMAKE_CURRENT_SOURCE_DIR}/wireguard/src/tools/" -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\" -Wno-pointer-arith -Wno-unused-parameter) +target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/uapi/" "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/") +target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -idirafter "${CMAKE_CURRENT_SOURCE_DIR}/libmnl/include/" -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\" -Wno-pointer-arith -Wno-unused-parameter) add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME} diff --git a/app/tools/wireguard b/app/tools/wireguard deleted file mode 160000 -Subproject 0b27b1d315e9d1e6edd0c5eadbd2010abd1746c diff --git a/app/tools/wireguard-tools b/app/tools/wireguard-tools new file mode 160000 +Subproject ae659490cfad766fcee3f8b80a807530c47e401 |