diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-03 17:09:45 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-03 17:09:45 +0100 |
| commit | e70d5be535d9bc97b3f9ed61b8acc1640fd3d757 (patch) | |
| tree | 8822792296d1dfcefb6a93408f520e67e4dd9b96 | |
| parent | 2ce51c8c2e01bc517739b9d277c596921b3ef6c3 (diff) | |
wg: remove mnl dependency and bump dep
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | app/tools/CMakeLists.txt | 4 | ||||
| m--------- | app/tools/libmnl | 0 | ||||
| m--------- | app/tools/wireguard-tools | 0 |
4 files changed, 2 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 03e09f61..77b129f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "app/tools/libmnl"] - path = app/tools/libmnl - url = https://git.netfilter.org/libmnl/ [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 36a614bd..90e61a06 100644 --- a/app/tools/CMakeLists.txt +++ b/app/tools/CMakeLists.txt @@ -12,10 +12,10 @@ add_executable(libwg-quick.so wireguard-tools/src/wg-quick/android.c ndk-compat/ 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-tools/src/*.c libmnl/src/*.c ndk-compat/compat.c) +file(GLOB WG_SOURCES wireguard-tools/src/*.c ndk-compat/compat.c) add_executable(libwg.so ${WG_SOURCES}) 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) +target_compile_options(libwg.so PUBLIC -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\") 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/libmnl b/app/tools/libmnl deleted file mode 160000 -Subproject 0930a63252958f40bb0f9d09de86985c25cea03 diff --git a/app/tools/wireguard-tools b/app/tools/wireguard-tools -Subproject 8082f7e6a88af9299952c472feae2bb6153dbb6 +Subproject 00d55f3cbe3f2192490e32921360308bb1cedb1 |