StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Soong: BPF: Cflag and btf defaults" into main

Browse Source
This commit is contained in:
Maciej Żenczykowski
2024-07-31 03:35:33 +00:00
committed by Gerrit Code Review
parent 530c32acbe 50a7bf8610
commit 469b5a1236
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bpf/bpf.go
View File

@@ -148,6 +148,10 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) {
"-no-canonical-prefixes", "-no-canonical-prefixes",
"-O2", "-O2",
"-Wall",
"-Werror",
"-Wextra",
"-isystem bionic/libc/include", "-isystem bionic/libc/include",
"-isystem bionic/libc/kernel/uapi", "-isystem bionic/libc/kernel/uapi",
// The architecture doesn't matter here, but asm/types.h is included by linux/types.h. // The architecture doesn't matter here, but asm/types.h is included by linux/types.h.
@@ -165,7 +169,7 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) {
cflags = append(cflags, bpf.properties.Cflags...) cflags = append(cflags, bpf.properties.Cflags...)
if proptools.Bool(bpf.properties.Btf) { if proptools.BoolDefault(bpf.properties.Btf, true) {
cflags = append(cflags, "-g") cflags = append(cflags, "-g")
if runtime.GOOS != "darwin" { if runtime.GOOS != "darwin" {
cflags = append(cflags, "-fdebug-prefix-map=/proc/self/cwd=") cflags = append(cflags, "-fdebug-prefix-map=/proc/self/cwd=")
@@ -190,7 +194,7 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}, },
}) })
if proptools.Bool(bpf.properties.Btf) { if proptools.BoolDefault(bpf.properties.Btf, true) {
objStripped := android.ObjPathWithExt(ctx, "", src, "o") objStripped := android.ObjPathWithExt(ctx, "", src, "o")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: stripRule, Rule: stripRule,