Restored Android makefile to working version.
authorMitar <mitar@tnode.com>
Mon, 28 Jun 2010 01:11:03 +0000 (03:11 +0200)
committerMitar <mitar@tnode.com>
Mon, 28 Jun 2010 01:11:03 +0000 (03:11 +0200)
make/Makefile.android

index 6610fe6..8cfd7fa 100644 (file)
@@ -14,8 +14,15 @@ HDRS +=              $(wildcard src/linux/*.h src/unix/*.h)
 
 CPPFLAGS +=    -Dlinux -DLINUX_NETLINK_ROUTING
 CPPFLAGS +=    -Dandroid
+
+# bionic libc: setbuf() segfaults, do not use
+CPPFLAGS +=    -D'setbuf(a,b)='
+
+# bionic libc: missing declaration
 CPPFLAGS +=    -DINET_ADDRSTRLEN=16
+# bionic libc: renamed declaration
 CPPFLAGS +=    -Dipv6mr_interface=ipv6mr_ifindex
+# bionic libc: missing declarations
 CPPFLAGS +=    -D'IPTOS_PREC(tos)=((tos)&0xe0)'
 CPPFLAGS +=    -D'IPTOS_TOS(tos)=((tos)&0x1e)'
 CPPFLAGS +=    -DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\"
@@ -50,7 +57,7 @@ CFLAGS += -I$(TOPDIR)/android
 
 LDFLAGS += -nostartfiles -nodefaultlibs -nostdlib
 LDFLAGS += -Wl,--dynamic-linker -Wl,/system/bin/linker
-LDFLAGS += -Wl,-L$(NDK_ARCH)/usr/lib
+LDFLAGS += -L$(NDK_ARCH)/usr/lib
 LDFLAGS += -Wl,-rpath-link -Wl,$(NDK_ARCH)/usr/lib
 ifndef OLSRD_PLUGIN
 LDFLAGS += $(NDK_ARCH)/usr/lib/crtbegin_dynamic.o