From fbef82d10366495bbd0dbb30cea015cb67c8105a Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 21 Feb 2014 15:31:54 -0800
Subject: [PATCH] android-clat: link against libnl instead of libnl_2

Change-Id: Ida397d0e8f347a78fb25353ea38760f3b4b499a6
---
 Android.mk    | 4 ++--
 netlink_msg.c | 1 +
 setroute.c    | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 240b25b8a9..635f2f64c8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,8 @@ include $(CLEAR_VARS)
 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_CFLAGS := -Wall -Werror
-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 2ba237d0dc..958559c0fa 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 f264387953..cffee9fb99 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"