resolved conflicts for merge of fbef82d1 to klp-dev-plus-aosp
Change-Id: I7ec85f26fc1f94324fbb57c031d760098d2f76cb
diff --git a/Android.mk b/Android.mk
index b0d19d9..e732c72 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,8 +3,8 @@
LOCAL_SRC_FILES:=clatd.c dump.c checksum.c translate.c icmp.c ipv4.c ipv6.c config.c dns64.c logging.c getaddr.c getroute.c netlink_callbacks.c netlink_msg.c setif.c setroute.c mtu.c
-LOCAL_C_INCLUDES := external/libnl-headers
-LOCAL_STATIC_LIBRARIES := libnl_2
+LOCAL_C_INCLUDES := external/libnl/include
+LOCAL_STATIC_LIBRARIES := libnl
LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_MODULE := clatd
diff --git a/netlink_msg.c b/netlink_msg.c
index 2ba237d..958559c 100644
--- a/netlink_msg.c
+++ b/netlink_msg.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <errno.h>
+#include <netlink-local.h>
#include <netlink-types.h>
#include <netlink/socket.h>
#include <netlink/netlink.h>
diff --git a/setroute.c b/setroute.c
index f264387..cffee9f 100644
--- a/setroute.c
+++ b/setroute.c
@@ -23,7 +23,6 @@
#include <linux/rtnetlink.h>
#include <netlink/handlers.h>
#include <netlink/msg.h>
-#include <netlink-types.h>
#include "netlink_msg.h"
#include "setroute.h"