commit 461773e6a373872bf933b8b7664da3cc386fb546
author Jaekyun Seok <jaekyun@google.com> Wed Dec 14 04:08:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 04:08:56 2016 +0000
tree b6613cbca0165b19a8f4ceb6429356dd11b62d75
parent cb8ac32ced20c964011dcd2ca070b12368b9c523
parent aafa3da3838e0ca0c02617397fe738849690226a

Merge "Support shared lib for libpcap." am: b7728adcc3 am: fb54911b0a am: aa30d96549
am: aafa3da383

Change-Id: I668ed498fb86746e7eebfb9c1f4f220523b09ca6

Android.mk

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 \