Merge "Build more libbpf-tools" am: 4c72bc236d am: 04c2fdb326

Original change: https://android-review.googlesource.com/c/platform/external/bcc/+/2008655

Change-Id: Iedbd1418cdd7615351cf4e61cf41c82c194652d4

1 files changed, 67 insertions, 0 deletions

diff --git a/libbpf-tools/Android.bp b/libbpf-tools/Android.bp
index f18dd509..c780bd07 100644
--- a/libbpf-tools/Android.bp
+++ b/libbpf-tools/Android.bp
@@ -24,6 +24,7 @@ cc_defaults {
         "-fno-stack-protector",
         "-fno-unwind-tables",
         "-mcpu=generic",
+        "-Wno-pointer-arith",
         "-Wno-unused-command-line-argument",
         "-Wno-unused-parameter",
     ],
@@ -109,6 +110,26 @@ cc_defaults {
 }
 
 cc_object {
+    name: "bindsnoop.bpf.o",
+    srcs: ["bindsnoop.bpf.c"],
+    defaults: ["bcc_bpf_defaults"],
+}
+
+genrule {
+    name: "bindsnoop.skel.h",
+    srcs: [":bindsnoop.bpf.o"],
+    out: ["bindsnoop.skel.h"],
+    defaults: ["bpf_skeleton_hdr_defaults"],
+}
+
+cc_binary {
+    name: "bindsnoop",
+    srcs: ["bindsnoop.c"],
+    generated_headers:  ["bindsnoop.skel.h"],
+    defaults: ["bcc_binary_defaults"],
+}
+
+cc_object {
     name: "cpudist.bpf.o",
     srcs: ["cpudist.bpf.c"],
     defaults: ["bcc_bpf_defaults"],
@@ -212,6 +233,29 @@ cc_binary {
 }
 
 cc_object {
+    name: "gethostlatency.bpf.o",
+    srcs: ["gethostlatency.bpf.c"],
+    defaults: ["bcc_bpf_defaults"],
+}
+
+genrule {
+    name: "gethostlatency.skel.h",
+    srcs: [":gethostlatency.bpf.o"],
+    out: ["gethostlatency.skel.h"],
+    defaults: ["bpf_skeleton_hdr_defaults"],
+}
+
+cc_binary {
+    name: "gethostlatency",
+    srcs: [
+        "gethostlatency.c",
+        "uprobe_helpers.c",
+    ],
+    generated_headers: ["gethostlatency.skel.h"],
+    defaults: ["bcc_binary_defaults"],
+}
+
+cc_object {
     name: "ksnoop.bpf.o",
     srcs: ["ksnoop.bpf.c"],
     defaults: ["bcc_bpf_defaults"],
@@ -353,3 +397,26 @@ cc_binary {
     generated_headers:  ["softirqs.skel.h"],
     defaults: ["bcc_binary_defaults"],
 }
+
+cc_object {
+    name: "tcpconnect.bpf.o",
+    srcs: ["tcpconnect.bpf.c"],
+    defaults: ["bcc_bpf_defaults"],
+}
+
+genrule {
+    name: "tcpconnect.skel.h",
+    srcs: [":tcpconnect.bpf.o"],
+    out: ["tcpconnect.skel.h"],
+    defaults: ["bpf_skeleton_hdr_defaults"],
+}
+
+cc_binary {
+    name: "tcpconnect",
+    srcs: [
+        "map_helpers.c",
+        "tcpconnect.c",
+    ],
+    generated_headers:  ["tcpconnect.skel.h"],
+    defaults: ["bcc_binary_defaults"],
+}