commit c86acc471f95cfeeedc396043312cd45f92d8ddf
author Lorenzo Colitti <lorenzo@google.com> Tue Mar 11 00:52:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 00:52:54 2014 +0000
tree 3ba3dd082281de3885fa3d857a2abba68d3deee8
parent a81cdae4a3ddbde7b32af0090ad16ff3b187a25d
parent f3beefc96a5a4f295562f60d648bd6e795980a10

am f3beefc9: Add a unit test for 464xlat translation code.

* commit 'f3beefc96a5a4f295562f60d648bd6e795980a10':
  Add a unit test for 464xlat translation code.

Android.mk

diff --git a/Android.mk b/Android.mk
index 886c0e0..112f05c 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
 
 # The clat daemon.