Merge "Soong: libbpf_prog: change output filetype to .bpf" into main
diff --git a/bpf/libbpf/libbpf_prog.go b/bpf/libbpf/libbpf_prog.go
index 0ca7af1..18e03a5 100644
--- a/bpf/libbpf/libbpf_prog.go
+++ b/bpf/libbpf/libbpf_prog.go
@@ -205,7 +205,7 @@
if strings.ContainsRune(src.Base(), '_') {
ctx.ModuleErrorf("invalid character '_' in source name")
}
- obj := android.ObjPathWithExt(ctx, "unstripped", src, "o")
+ obj := android.ObjPathWithExt(ctx, "unstripped", src, "bpf")
ctx.Build(pctx, android.BuildParams{
Rule: libbpfProgCcRule,
@@ -218,7 +218,7 @@
},
})
- objStripped := android.ObjPathWithExt(ctx, "", src, "o")
+ objStripped := android.ObjPathWithExt(ctx, "", src, "bpf")
ctx.Build(pctx, android.BuildParams{
Rule: libbpfProgStripRule,
Input: obj,
@@ -230,7 +230,7 @@
libbpf.objs = append(libbpf.objs, objStripped.WithoutRel())
}
- installDir := android.PathForModuleInstall(ctx, "etc", "bpf/libbpf")
+ installDir := android.PathForModuleInstall(ctx, "etc", "bpf")
if len(libbpf.properties.Relative_install_path) > 0 {
installDir = installDir.Join(ctx, libbpf.properties.Relative_install_path)
}
@@ -251,7 +251,7 @@
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w)
var localModulePath string
- localModulePath = "LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/bpf/libbpf"
+ localModulePath = "LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/bpf"
if len(libbpf.properties.Relative_install_path) > 0 {
localModulePath += "/" + libbpf.properties.Relative_install_path
}
diff --git a/bpf/libbpf/libbpf_prog_test.go b/bpf/libbpf/libbpf_prog_test.go
index 7f3653d..2b3b378 100644
--- a/bpf/libbpf/libbpf_prog_test.go
+++ b/bpf/libbpf/libbpf_prog_test.go
@@ -41,7 +41,7 @@
func TestLibbpfProgDataDependency(t *testing.T) {
bp := `
libbpf_prog {
- name: "bpf.o",
+ name: "bpf.bpf",
srcs: ["bpf.c"],
}
@@ -49,7 +49,7 @@
name: "vts_test_binary_bpf_module",
compile_multilib: "first",
srcs: ["BpfTest.cpp"],
- data: [":bpf.o"],
+ data: [":bpf.bpf"],
gtest: false,
}
`
@@ -60,7 +60,7 @@
func TestLibbpfProgSourceName(t *testing.T) {
bp := `
libbpf_prog {
- name: "bpf_invalid_name.o",
+ name: "bpf_invalid_name.bpf",
srcs: ["bpf_invalid_name.c"],
}
`