Adjustments to fix build errors

AdAway · Feb 12, 2015 · 08da074 · 08da074
1 parent 2968cd6
commit 08da074
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/AdAway/jni/libpcap/Android.mk b/AdAway/jni/libpcap/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-libpcap_PSRC =	pcap-linux.c pcap-usb-linux.c  pcap-can-linux.c pcap-netfilter-linux.c  
+libpcap_PSRC =	pcap-linux.c
 libpcap_FSRC =  fad-gifc.c
 libpcap_CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
 	savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \

diff --git a/AdAway/jni/libpcap/config.h b/AdAway/jni/libpcap/config.h
@@ -75,25 +75,25 @@
 /* #undef HAVE_LINUX_COMPILER_H */
 
 /* Define to 1 if you have the <linux/ethtool.h> header file. */
-#define HAVE_LINUX_ETHTOOL_H 1
+/* #undef HAVE_LINUX_ETHTOOL_H */
 
 /* Define to 1 if you have the <linux/if_packet.h> header file. */
-#define HAVE_LINUX_IF_PACKET_H 1
+/* #undef HAVE_LINUX_IF_PACKET_H */
 
 /* Define to 1 if you have the <linux/net_tstamp.h> header file. */
-#define HAVE_LINUX_NET_TSTAMP_H 1
+/* #undef HAVE_LINUX_NET_TSTAMP_H */
 
 /* if tp_vlan_tci exists */
-#define HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI 1
+/* #undef HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI */
 
 /* Define to 1 if you have the <linux/types.h> header file. */
-#define HAVE_LINUX_TYPES_H 1
+/* #undef HAVE_LINUX_TYPES_H */
 
 /* Define to 1 if you have the <linux/usbdevice_fs.h> header file. */
-#define HAVE_LINUX_USBDEVICE_FS_H 1
+/* #undef HAVE_LINUX_USBDEVICE_FS_H */
 
 /* Define to 1 if you have the <linux/wireless.h> header file. */
-#define HAVE_LINUX_WIRELESS_H 1
+/* #undef HAVE_LINUX_WIRELESS_H */
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
@@ -198,7 +198,7 @@
 #define HAVE_UNISTD_H 1
 
 /* if struct usbdevfs_ctrltransfer has bRequestType */
-#define HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1
+/* #undef HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE */
 
 /* define if version.h is generated in the build procedure */
 #define HAVE_VERSION_H 1
@@ -267,10 +267,10 @@
 /* #undef PCAP_SUPPORT_DBUS */
 
 /* target host supports netfilter sniffing */
-#define PCAP_SUPPORT_NETFILTER 1
+/* #undef PCAP_SUPPORT_NETFILTER */
 
 /* target host supports USB sniffing */
-#define PCAP_SUPPORT_USB 1
+/* #undef PCAP_SUPPORT_USB */
 
 /* include ACN support */
 /* #undef SITA */

diff --git a/AdAway/jni/libpcap/pcap-linux.c b/AdAway/jni/libpcap/pcap-linux.c
@@ -115,7 +115,9 @@ static const char rcsid[] _U_ =
  */
 
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/AdAway/jni/tcpdump/Android.mk b/AdAway/jni/tcpdump/Android.mk
@@ -42,10 +42,9 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -D_U_="__attribute__((unused))"
 
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/missing\
-	external/openssl/include\
-	external/libpcap
+	$(LOCAL_PATH)/../libpcap
 
-LOCAL_SHARED_LIBRARIES += libssl libcrypto
+#LOCAL_SHARED_LIBRARIES += libssl libcrypto
 
 LOCAL_STATIC_LIBRARIES += libpcap
 

diff --git a/AdAway/jni/tcpdump/config.h b/AdAway/jni/tcpdump/config.h
@@ -39,7 +39,7 @@
 #define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
-#define HAVE_LIBCRYPTO 1
+/* #undef HAVE_LIBCRYPTO */
 
 /* Define to 1 if you have the `rpc' library (-lrpc). */
 /* #undef HAVE_LIBRPC */