Merge "Support shared lib for libpcap." am: b7728adcc3 am: fb54911b0a
am: aa30d96549
Change-Id: I620d0062f6a20ff47012b13c334c47d548b85b6b
diff --git a/Android.mk b/Android.mk
index 9e27ce8..8c691bf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- pcap-linux.c pcap-usb-linux.c pcap-can-linux.c pcap-netfilter-linux.c pcap-netfilter-linux-android.c \
+ pcap-linux.c pcap-usb-linux.c pcap-can-linux.c pcap-netfilter-linux-android.c \
fad-gifc.c \
pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
@@ -31,6 +31,13 @@
include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libpcap
+LOCAL_MODULE := libpcap
+
+include $(BUILD_SHARED_LIBRARY)
+
libpcap_tests := \
tests/capturetest.c \
tests/filtertest.c \