diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-13 07:21:20 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-13 07:21:20 +0000 |
commit | 1ed2f6ca939186cf0eb3f38ba3970b6551f83f4f (patch) | |
tree | 2816f17f4c404081c8a06663f79fe7b45f4472b7 | |
parent | 4c37ee168b8fed625078c9266226ac2de789b1d0 (diff) | |
parent | e39cc47d1f1619346a096c0bcdecfa1a66d9d432 (diff) | |
download | libpcap-1ed2f6ca939186cf0eb3f38ba3970b6551f83f4f.tar.gz |
Snap for 4778776 from e39cc47d1f1619346a096c0bcdecfa1a66d9d432 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: If8359d2d91e40cba1c78e41958a68a2076d653d6
-rw-r--r-- | Android.bp | 87 | ||||
-rw-r--r-- | Android.mk | 58 | ||||
-rw-r--r-- | OWNERS | 1 |
3 files changed, 88 insertions, 58 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..1d3a5cbb --- /dev/null +++ b/Android.bp @@ -0,0 +1,87 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +cc_defaults { + name: "libpcap_defaults", + cflags: [ + "-D_BSD_SOURCE", + "-DHAVE_CONFIG_H", + "-Dlint", + "-D_U_=__attribute__((__unused__))", + "-Wall", + "-Werror", + "-Wno-macro-redefined", + "-Wno-pointer-arith", + "-Wno-sign-compare", + "-Wno-unused-parameter", + "-Wno-unused-result", + "-Wno-tautological-compare", + ], +} + +cc_library { + name: "libpcap", + host_supported: false, + vendor_available: true, + defaults: ["libpcap_defaults"], + + // (Matches order in libpcap's Makefile.) + srcs: [ + "pcap-linux.c", + "pcap-usb-linux.c", + "pcap-netfilter-linux-android.c", + "fad-getad.c", + "pcap.c", + "inet.c", + "fad-helpers.c", + "gencode.c", + "optimize.c", + "nametoaddr.c", + "etherent.c", + "savefile.c", + "sf-pcap.c", + "sf-pcap-ng.c", + "pcap-common.c", + "bpf_image.c", + "bpf_dump.c", + "scanner.c", + "grammar.c", + "bpf_filter.c", + "version.c", + ], + + export_include_dirs: ["."], +} + +// +// Tests. +// + +cc_test { + name: "libpcap_test", + defaults: ["libpcap_defaults"], + gtest: false, + // (Matches order in libpcap's Makefile.) + srcs: [ + "tests/capturetest.c", + "tests/can_set_rfmon_test.c", + "tests/filtertest.c", + "tests/findalldevstest.c", + "tests/opentest.c", + "tests/reactivatetest.c", + "tests/selpolltest.c", + ], + static_libs: ["libpcap"], + test_per_src: true, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 098e83a0..00000000 --- a/Android.mk +++ /dev/null @@ -1,58 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -libpcap_cflags := \ - -Wno-macro-redefined \ - -Wno-pointer-arith \ - -Wno-sign-compare \ - -Wno-unused-parameter \ - -D_BSD_SOURCE \ - -D_U_="__attribute__((unused))" \ - -Werror \ - -include $(CLEAR_VARS) - -# (Matches order in libpcap's Makefile.) -LOCAL_SRC_FILES := \ - pcap-linux.c pcap-usb-linux.c pcap-netfilter-linux-android.c \ - fad-getad.c \ - pcap.c inet.c fad-helpers.c gencode.c optimize.c nametoaddr.c \ - etherent.c savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \ - bpf_image.c bpf_dump.c \ - scanner.c grammar.c bpf_filter.c version.c \ - -LOCAL_CFLAGS += $(libpcap_cflags) -LOCAL_CFLAGS += -DHAVE_CONFIG_H - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -LOCAL_MODULE:= libpcap - -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libpcap -LOCAL_MODULE := libpcap -LOCAL_CFLAGS := -Wall -Werror - -include $(BUILD_SHARED_LIBRARY) - -# (Matches order in libpcap's Makefile.) -libpcap_tests := \ - tests/valgrindtest.c \ - tests/capturetest.c \ - tests/can_set_rfmon_test.c \ - tests/filtertest.c \ - tests/findalldevstest.c \ - tests/opentest.c \ - tests/reactivatetest.c \ - tests/selpolltest.c \ - -$(foreach test,$(libpcap_tests), \ - $(eval include $(CLEAR_VARS)) \ - $(eval LOCAL_MODULE := libpcap_$(basename $(notdir $(test)))) \ - $(eval LOCAL_SRC_FILES := $(test)) \ - $(eval LOCAL_CFLAGS := $(libpcap_cflags)) \ - $(eval LOCAL_STATIC_LIBRARIES := libpcap) \ - $(eval include $(BUILD_NATIVE_TEST)) \ -) @@ -0,0 +1 @@ +enh@google.com |