aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaekyun Seok <jaekyun@google.com>2016-12-14 03:54:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-14 03:54:57 +0000
commitaa30d965493b290bc80e780ecfc7457539ff1fca (patch)
treee5614c4724d4f2bdeb08aad548799a2d835a8d4b
parent8a06d9fe1e7f36901c2764446a1a4203a4c531a1 (diff)
parentfb54911b0a9cf3bb13b37ee05f68a74815538611 (diff)
downloadlibpcap-aa30d965493b290bc80e780ecfc7457539ff1fca.tar.gz
Merge "Support shared lib for libpcap." am: b7728adcc3
am: fb54911b0a Change-Id: I225b5678f5c48743a25e864e5e6efde7dbe474f6
-rw-r--r--Android.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 9e27ce84..8c691bfe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,7 @@ libpcap_cflags := \
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 @@ LOCAL_MODULE:= libpcap
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 \