commit 1a62f5d8e777eed3486d7abc3bb03daa94f16bf9
author Lorenzo Colitti <lorenzo@google.com> Tue Mar 11 09:31:45 2014 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Mar 11 09:31:45 2014 +0900
tree b71c1ae1354d1214940af1a9815e961b7bd53177
parent 48ce8aaf3d9baa735b047833451228657266b068
parent 07f0265830fcae2632159e9993b93a161d7ea23b

resolved conflicts for merge of 07f02658 to klp-dev-plus-aosp

Android.mk

diff --git a/Android.mk b/Android.mk
index 635f2f6..240b25b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,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_CFLAGS := -Wall -Werror
-LOCAL_C_INCLUDES := external/libnl/include
-LOCAL_STATIC_LIBRARIES := libnl
+LOCAL_C_INCLUDES := external/libnl-headers
+LOCAL_STATIC_LIBRARIES := libnl_2
 LOCAL_SHARED_LIBRARIES := libcutils liblog
 
 LOCAL_MODULE := clatd