Merge "Switch tcpdump to Android.bp."

am: 05033025e4

Change-Id: Ia3de00781b9f7fc7bcf032a9e1d403a4cc48b239

3 files changed, 212 insertions, 194 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..2eaeb653
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,211 @@
+// 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_binary {
+    name: "tcpdump",
+    host_supported: false,
+
+    cflags: [
+        "-D_BSD_SOURCE",
+        "-DHAVE_CONFIG_H",
+        "-D_U_=__attribute__((__unused__))",
+        "-Wall",
+        "-Werror",
+        "-Wno-sign-compare",
+        "-Wno-address-of-packed-member", // http://b/33566695
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
+    ],
+
+    // Based on the tcpdump Makefile...
+    srcs: [
+        // CSRC
+        "setsignal.c",
+        "tcpdump.c",
+        // LIBNETDISSECT_SRC
+        "addrtoname.c",
+        "addrtostr.c",
+        "af.c",
+        "ascii_strcasecmp.c",
+        "checksum.c",
+        "cpack.c",
+        "gmpls.c",
+        "gmt2local.c",
+        "in_cksum.c",
+        "ipproto.c",
+        "l2vpn.c",
+        "machdep.c",
+        "nlpid.c",
+        "oui.c",
+        "parsenfsfh.c",
+        "print.c",
+        "print-802_11.c",
+        "print-802_15_4.c",
+        "print-ah.c",
+        "print-ahcp.c",
+        "print-aodv.c",
+        "print-aoe.c",
+        "print-ap1394.c",
+        "print-arcnet.c",
+        "print-arp.c",
+        "print-ascii.c",
+        "print-atalk.c",
+        "print-atm.c",
+        "print-babel.c",
+        "print-beep.c",
+        "print-bfd.c",
+        "print-bgp.c",
+        "print-bootp.c",
+        "print-bt.c",
+        "print-calm-fast.c",
+        "print-carp.c",
+        "print-cdp.c",
+        "print-cfm.c",
+        "print-chdlc.c",
+        "print-cip.c",
+        "print-cnfp.c",
+        "print-dccp.c",
+        "print-decnet.c",
+        "print-dhcp6.c",
+        "print-domain.c",
+        "print-dtp.c",
+        "print-dvmrp.c",
+        "print-eap.c",
+        "print-egp.c",
+        "print-eigrp.c",
+        "print-enc.c",
+        "print-esp.c",
+        "print-ether.c",
+        "print-fddi.c",
+        "print-forces.c",
+        "print-fr.c",
+        "print-frag6.c",
+        "print-ftp.c",
+        "print-geneve.c",
+        "print-geonet.c",
+        "print-gre.c",
+        "print-hncp.c",
+        "print-hsrp.c",
+        "print-http.c",
+        "print-icmp.c",
+        "print-icmp6.c",
+        "print-igmp.c",
+        "print-igrp.c",
+        "print-ip.c",
+        "print-ip6.c",
+        "print-ip6opts.c",
+        "print-ipcomp.c",
+        "print-ipfc.c",
+        "print-ipnet.c",
+        "print-ipx.c",
+        "print-isakmp.c",
+        "print-isoclns.c",
+        "print-juniper.c",
+        "print-krb.c",
+        "print-l2tp.c",
+        "print-lane.c",
+        "print-ldp.c",
+        "print-lisp.c",
+        "print-llc.c",
+        "print-lldp.c",
+        "print-lmp.c",
+        "print-loopback.c",
+        "print-lspping.c",
+        "print-lwapp.c",
+        "print-lwres.c",
+        "print-m3ua.c",
+        "print-medsa.c",
+        "print-mobile.c",
+        "print-mobility.c",
+        "print-mpcp.c",
+        "print-mpls.c",
+        "print-mptcp.c",
+        "print-msdp.c",
+        "print-msnlb.c",
+        "print-nflog.c",
+        "print-nfs.c",
+        "print-nsh.c",
+        "print-ntp.c",
+        "print-null.c",
+        "print-olsr.c",
+        "print-openflow-1.0.c",
+        "print-openflow.c",
+        "print-ospf.c",
+        "print-ospf6.c",
+        "print-otv.c",
+        "print-pgm.c",
+        "print-pim.c",
+        "print-pktap.c",
+        "print-ppi.c",
+        "print-ppp.c",
+        "print-pppoe.c",
+        "print-pptp.c",
+        "print-radius.c",
+        "print-raw.c",
+        "print-resp.c",
+        "print-rip.c",
+        "print-ripng.c",
+        "print-rpki-rtr.c",
+        "print-rrcp.c",
+        "print-rsvp.c",
+        "print-rt6.c",
+        "print-rtsp.c",
+        "print-rx.c",
+        "print-sctp.c",
+        "print-sflow.c",
+        "print-sip.c",
+        "print-sl.c",
+        "print-sll.c",
+        "print-slow.c",
+        "print-smtp.c",
+        "print-snmp.c",
+        "print-stp.c",
+        "print-sunatm.c",
+        "print-sunrpc.c",
+        "print-symantec.c",
+        "print-syslog.c",
+        "print-tcp.c",
+        "print-telnet.c",
+        "print-tftp.c",
+        "print-timed.c",
+        "print-tipc.c",
+        "print-token.c",
+        "print-udld.c",
+        "print-udp.c",
+        "print-usb.c",
+        "print-vjc.c",
+        "print-vqp.c",
+        "print-vrrp.c",
+        "print-vtp.c",
+        "print-vxlan.c",
+        "print-vxlan-gpe.c",
+        "print-wb.c",
+        "print-zephyr.c",
+        "print-zeromq.c",
+        "netdissect.c",
+        "signature.c",
+        "strtoaddr.c",
+        "util-print.c",
+        // LOCALSRC
+        "print-smb.c",
+        "smbutil.c",
+        // GENSRC
+        "version.c",
+    ],
+
+    shared_libs: [
+        "libssl",
+        "libcrypto",
+        "libpcap",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 1e5e3b22..00000000
--- a/Android.mk
+++ /dev/null
@@ -1,194 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# Based on the tcpdump Makefile...
-
-# CSRC
-tcpdump_src_files := setsignal.c tcpdump.c
-
-# LIBNETDISSECT_SRC
-tcpdump_src_files += \
-        addrtoname.c \
-        addrtostr.c \
-        af.c \
-        ascii_strcasecmp.c \
-        checksum.c \
-        cpack.c \
-        gmpls.c \
-        gmt2local.c \
-        in_cksum.c \
-        ipproto.c \
-        l2vpn.c \
-        machdep.c \
-        nlpid.c \
-        oui.c \
-        parsenfsfh.c \
-        print.c \
-        print-802_11.c \
-        print-802_15_4.c \
-        print-ah.c \
-        print-ahcp.c \
-        print-aodv.c \
-        print-aoe.c \
-        print-ap1394.c \
-        print-arcnet.c \
-        print-arp.c \
-        print-ascii.c \
-        print-atalk.c \
-        print-atm.c \
-        print-babel.c \
-        print-beep.c \
-        print-bfd.c \
-        print-bgp.c \
-        print-bootp.c \
-        print-bt.c \
-        print-calm-fast.c \
-        print-carp.c \
-        print-cdp.c \
-        print-cfm.c \
-        print-chdlc.c \
-        print-cip.c \
-        print-cnfp.c \
-        print-dccp.c \
-        print-decnet.c \
-        print-dhcp6.c \
-        print-domain.c \
-        print-dtp.c \
-        print-dvmrp.c \
-        print-eap.c \
-        print-egp.c \
-        print-eigrp.c \
-        print-enc.c \
-        print-esp.c \
-        print-ether.c \
-        print-fddi.c \
-        print-forces.c \
-        print-fr.c \
-        print-frag6.c \
-        print-ftp.c \
-        print-geneve.c \
-        print-geonet.c \
-        print-gre.c \
-        print-hncp.c \
-        print-hsrp.c \
-        print-http.c \
-        print-icmp.c \
-        print-icmp6.c \
-        print-igmp.c \
-        print-igrp.c \
-        print-ip.c \
-        print-ip6.c \
-        print-ip6opts.c \
-        print-ipcomp.c \
-        print-ipfc.c \
-        print-ipnet.c \
-        print-ipx.c \
-        print-isakmp.c \
-        print-isoclns.c \
-        print-juniper.c \
-        print-krb.c \
-        print-l2tp.c \
-        print-lane.c \
-        print-ldp.c \
-        print-lisp.c \
-        print-llc.c \
-        print-lldp.c \
-        print-lmp.c \
-        print-loopback.c \
-        print-lspping.c \
-        print-lwapp.c \
-        print-lwres.c \
-        print-m3ua.c \
-        print-medsa.c \
-        print-mobile.c \
-        print-mobility.c \
-        print-mpcp.c \
-        print-mpls.c \
-        print-mptcp.c \
-        print-msdp.c \
-        print-msnlb.c \
-        print-nflog.c \
-        print-nfs.c \
-        print-nsh.c \
-        print-ntp.c \
-        print-null.c \
-        print-olsr.c \
-        print-openflow-1.0.c \
-        print-openflow.c \
-        print-ospf.c \
-        print-ospf6.c \
-        print-otv.c \
-        print-pgm.c \
-        print-pim.c \
-        print-pktap.c \
-        print-ppi.c \
-        print-ppp.c \
-        print-pppoe.c \
-        print-pptp.c \
-        print-radius.c \
-        print-raw.c \
-        print-resp.c \
-        print-rip.c \
-        print-ripng.c \
-        print-rpki-rtr.c \
-        print-rrcp.c \
-        print-rsvp.c \
-        print-rt6.c \
-        print-rtsp.c \
-        print-rx.c \
-        print-sctp.c \
-        print-sflow.c \
-        print-sip.c \
-        print-sl.c \
-        print-sll.c \
-        print-slow.c \
-        print-smtp.c \
-        print-snmp.c \
-        print-stp.c \
-        print-sunatm.c \
-        print-sunrpc.c \
-        print-symantec.c \
-        print-syslog.c \
-        print-tcp.c \
-        print-telnet.c \
-        print-tftp.c \
-        print-timed.c \
-        print-tipc.c \
-        print-token.c \
-        print-udld.c \
-        print-udp.c \
-        print-usb.c \
-        print-vjc.c \
-        print-vqp.c \
-        print-vrrp.c \
-        print-vtp.c \
-        print-vxlan.c \
-        print-vxlan-gpe.c \
-        print-wb.c \
-        print-zephyr.c \
-        print-zeromq.c \
-        netdissect.c \
-        signature.c \
-        strtoaddr.c \
-        util-print.c \
-
-# LOCALSRC
-tcpdump_src_files += print-smb.c smbutil.c
-
-# GENSRC
-tcpdump_src_files += version.c
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(tcpdump_src_files)
-LOCAL_CFLAGS += -D_BSD_SOURCE
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
-LOCAL_CFLAGS += -D_U_="__attribute__((unused))"
-LOCAL_CFLAGS += -Werror
-# http://b/33566695
-LOCAL_CFLAGS += -Wno-address-of-packed-member
-LOCAL_CFLAGS += -Wno-sign-compare
-LOCAL_CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
-LOCAL_SHARED_LIBRARIES += libssl libcrypto libpcap
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := tcpdump
-include $(BUILD_EXECUTABLE)
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 00000000..682a067b
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+enh@google.com