diff options
author | Elliott Hughes <enh@google.com> | 2018-04-10 22:44:35 -0700 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2018-05-09 22:28:15 +0900 |
commit | e39cc47d1f1619346a096c0bcdecfa1a66d9d432 (patch) | |
tree | 2816f17f4c404081c8a06663f79fe7b45f4472b7 | |
parent | 491aa41405dcf25cc4f792c0e36553f6e1fba116 (diff) | |
download | libpcap-pie-qpr1-release.tar.gz |
Switch to Android.bp.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
Also add OWNERS.
Bug: 77850274
Test: builds
Merged-In: I692ce779381dc5529177aefe379891855fb909bc
Change-Id: I692ce779381dc5529177aefe379891855fb909bc
(cherry picked from commit 22ad79bbdf8f59d69f4b208b48b557c1cc1c3b70)
-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 |