diff options
| author | Connor O'Brien <connoro@google.com> | 2022-02-23 20:45:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-23 20:45:29 +0000 |
| commit | e25642217768a3fc6aa2819ff72fc8a9f5b15b7d (patch) | |
| tree | d7e34ed1e754640738008bc922a4b3e2dcb86219 | |
| parent | e45f539a50e0239bda1938e325d2092aa09b033e (diff) | |
| parent | 1c846013701a280e4231dded9d06fea290a57870 (diff) | |
| download | libbpf-e25642217768a3fc6aa2819ff72fc8a9f5b15b7d.tar.gz | |
Merge "libbpf: support building bpftool" am: 1c84601370
Original change: https://android-review.googlesource.com/c/platform/external/libbpf/+/1985610
Change-Id: I324a13219c5cdb156716c162f4d0f85dd21b413e
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | src/skel_internal.h | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -45,10 +45,12 @@ genrule { "bpf/bpf_helpers.h", "bpf/bpf_tracing.h", "bpf/btf.h", + "bpf/hashmap.h", "bpf/libbpf_common.h", "bpf/libbpf.h", "bpf/libbpf_legacy.h", "bpf/libbpf_version.h", + "bpf/nlattr.h", "bpf/skel_internal.h", "bpf/xsk.h", ], @@ -82,6 +84,7 @@ cc_library_static { "libz", ], visibility: [ + "//external/bpftool", "//external/dwarves", "//external/stg", ], diff --git a/src/skel_internal.h b/src/skel_internal.h index 2761970..dcd3336 100644 --- a/src/skel_internal.h +++ b/src/skel_internal.h @@ -57,9 +57,6 @@ struct bpf_load_and_run_opts { const char *errstr; }; -// ANDROID: Since the glibc stub we have does not know about __NR_bpf, this -// fails to compile. For now, just do not provide this functionality. -#if 0 static inline int skel_sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, unsigned int size) { @@ -199,6 +196,5 @@ out: close(prog_fd); return err; } -#endif #endif |