From 2d3682778129896e07f38cd8c4a8b7a93e75253a Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 3 Feb 2020 17:09:45 +0100
Subject: wg: remove mnl dependency and bump dep

---
 .gitmodules               | 3 ---
 app/tools/CMakeLists.txt  | 4 ++--
 app/tools/libmnl          | 1 -
 app/tools/wireguard-tools | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 160000 app/tools/libmnl

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
index 0930a632..00000000
--- a/app/tools/libmnl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0930a63252958f40bb0f9d09de86985c25cea039
diff --git a/app/tools/wireguard-tools b/app/tools/wireguard-tools
index 8082f7e6..00d55f3c 160000
--- a/app/tools/wireguard-tools
+++ b/app/tools/wireguard-tools
@@ -1 +1 @@
-Subproject commit 8082f7e6a88af9299952c472feae2bb6153dbb6c
+Subproject commit 00d55f3cbe3f2192490e32921360308bb1cedb15
-- 
cgit v1.2.3-59-g8ed1b