Merge "Soong: libbpf_prog: change output filetype to .bpf" into main (9ddba9f7) · Commits · e / os / android_build_soong

bpf/libbpf/libbpf_prog.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ func (libbpf *libbpfProg) GenerateAndroidBuildActions(ctx android.ModuleContext)
		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 @@ func (libbpf *libbpfProg) GenerateAndroidBuildActions(ctx android.ModuleContext)
		},
		})

		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 @@ func (libbpf *libbpfProg) GenerateAndroidBuildActions(ctx android.ModuleContext)
		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 @@ func (libbpf *libbpfProg) AndroidMk() android.AndroidMkData {
		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
		}

bpf/libbpf/libbpf_prog_test.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ var prepareForLibbpfProgTest = android.GroupFixturePreparers(
		func TestLibbpfProgDataDependency(t *testing.T) {
		bp := `
		libbpf_prog {
		name: "bpf.o",
		name: "bpf.bpf",
		srcs: ["bpf.c"],
		}

		@@ -49,7 +49,7 @@ func TestLibbpfProgDataDependency(t *testing.T) {
		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 TestLibbpfProgDataDependency(t *testing.T) {
		func TestLibbpfProgSourceName(t *testing.T) {
		bp := `
		libbpf_prog {
		name: "bpf_invalid_name.o",
		name: "bpf_invalid_name.bpf",
		srcs: ["bpf_invalid_name.c"],
		}
		`