| commit | 41f379309a6a2a22e4feb36d69b7376f66aed9a1 | [log] [tgz] |
|---|---|---|
| author | Neill Kapron <nkapron@google.com> | Fri Nov 22 21:43:43 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 21:43:43 2024 +0000 |
| tree | 10e559556221339c935d98dd8435fbbde81a513b | |
| parent | 2dca8386c7381f66cb7eafa65ea4cdaa7d64e545 [diff] | |
| parent | 88d2f096a3d3710275b26ea401b64b4449f04dea [diff] |
Merge "Soong: libbpf_prog: Define ENABLE_LIBBPF" into main am: 1a6f176ce0 am: 88d2f096a3 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3367694 Change-Id: I7e7d85ad4f671364f6772b9466e774ef9046fbd5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bpf/libbpf/libbpf_prog.go b/bpf/libbpf/libbpf_prog.go index 18e03a5..3b26d46 100644 --- a/bpf/libbpf/libbpf_prog.go +++ b/bpf/libbpf/libbpf_prog.go
@@ -158,7 +158,8 @@ "-Wall", "-Werror", "-Wextra", - + // Flag to assist with the transition to libbpf + "-DENABLE_LIBBPF", "-isystem bionic/libc/include", "-isystem bionic/libc/kernel/uapi", // The architecture doesn't matter here, but asm/types.h is included by linux/types.h.