diff options
| author | Jaekyun Seok <jaekyun@google.com> | 2016-12-14 04:08:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 04:08:56 +0000 |
| commit | 461773e6a373872bf933b8b7664da3cc386fb546 (patch) | |
| tree | b6613cbca0165b19a8f4ceb6429356dd11b62d75 | |
| parent | cb8ac32ced20c964011dcd2ca070b12368b9c523 (diff) | |
| parent | aafa3da3838e0ca0c02617397fe738849690226a (diff) | |
| download | libpcap-oreo-cts-release.tar.gz | |
Merge "Support shared lib for libpcap." am: b7728adcc3 am: fb54911b0a am: aa30d96549android-wear-o-preview-4android-wear-o-preview-3android-wear-8.0.0_r1android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-iot-preview-5android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2o-previewo-iot-preview-5
am: aafa3da383
Change-Id: I668ed498fb86746e7eebfb9c1f4f220523b09ca6
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -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 \ |