Adjustments for libpcap and tcpdump to compile

AdAway/jni/libpcap/Android.mk

@@ -17,6 +17,8 @@ LOCAL_SRC_FILES:=\
 LOCAL_CFLAGS:=-O2 -g
 LOCAL_CFLAGS+=-DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -Dlinux -D__GLIBC__ -D_GNU_SOURCE
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
 LOCAL_MODULE:= libpcap
 
 include $(BUILD_STATIC_LIBRARY)

AdAway/jni/libpcap/pcap-linux.c

@@ -110,7 +110,9 @@
  */
 
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

AdAway/jni/tcpdump/Android.mk

@@ -3,27 +3,27 @@ include $(CLEAR_VARS)
 
 tcpdump_CSRC =	addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \
         nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
-	print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
-	print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
+	print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c print-ahcp.c \
+	print-arcnet.c print-aodv.c print-aoe.c print-arp.c print-ascii.c print-atalk.c \
 	print-atm.c print-beep.c print-bfd.c print-bgp.c \
 	print-bootp.c print-bt.c print-calm-fast.c print-carp.c print-cdp.c print-cfm.c \
 	print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
 	print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
-	print-eap.c print-eigrp.c\
-	print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \
-	print-geonet.c print-gre.c print-hsrp.c print-icmp.c print-igmp.c \
+	print-eap.c print-eigrp.c \
+	print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-ftp.c \
+	print-geneve.c print-geonet.c print-gre.c print-hsrp.c print-http.c print-icmp.c print-igmp.c \
 	print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \
 	print-ipx.c print-isoclns.c print-juniper.c print-krb.c \
 	print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
-        print-lmp.c print-lspping.c print-lwapp.c \
-	print-lwres.c print-mobile.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c \
+    print-lmp.c print-loopback.c print-lspping.c print-lwapp.c print-lwres.c \
+	print-m3ua.c print-mobile.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c \
 	print-msnlb.c print-nflog.c print-nfs.c print-ntp.c print-null.c \
 	print-olsr.c print-openflow.c print-openflow-1.0.c print-ospf.c \
-	print-pgm.c print-pim.c \
+	print-pgm.c print-pim.c print-pktap.c\
 	print-ppi.c print-ppp.c print-pppoe.c print-pptp.c \
 	print-radius.c print-raw.c print-rip.c print-rpki-rtr.c print-rrcp.c print-rsvp.c \
-	print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c \
-	print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \
+	print-rtsp.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c \
+	print-slow.c print-smtp.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \
 	print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c \
 	print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c \
 	print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \

AdAway/jni/tcpdump/config.h

@@ -66,7 +66,7 @@
 /* #undef HAVE_NET_PFVAR_H */
 
 /* Define to 1 if you have the <openssl/evp.h> header file. */
-#define HAVE_OPENSSL_EVP_H 1
+/* #undef HAVE_OPENSSL_EVP_H */
 
 /* if there's an os_proto.h for this platform, to use additional prototypes */
 /* #undef HAVE_OS_PROTO_H */
@@ -273,7 +273,7 @@
 #define STDC_HEADERS 1
 
 /* define if you want to build the possibly-buggy SMB printer */
-#define TCPDUMP_DO_SMB 1
+/* #undef TCPDUMP_DO_SMB */
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1