diff options
| author | 2024-11-15 23:41:13 +0000 | |
|---|---|---|
| committer | 2024-11-20 03:02:37 +0000 | |
| commit | 83815b3823285e86886dc0072873036fb12d2001 (patch) | |
| tree | 624ba1d4ec4425dc7b8cae9fc4293c120c6c8d24 | |
| parent | 04a33c6934f46d7a0013401aa05711ec7dc15f56 (diff) | |
Soong: libbpf_prog: change output filetype to .bpf
Changing libbpf_prog output types to .bpf to differentiate from legacy
bpf.o files. Also, removing libbpf from the output directory.
Bug: 359646531
Test: manual/TH
Change-Id: I9ee22099acf57920bc5054ecf42e209a7b6418b6
Signed-off-by: Neill Kapron <nkapron@google.com>
| -rw-r--r-- | bpf/libbpf/libbpf_prog.go | 8 | ||||
| -rw-r--r-- | bpf/libbpf/libbpf_prog_test.go | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bpf/libbpf/libbpf_prog.go b/bpf/libbpf/libbpf_prog.go index 0ca7af1f7..18e03a5e7 100644 --- a/bpf/libbpf/libbpf_prog.go +++ b/bpf/libbpf/libbpf_prog.go @@ -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 } diff --git a/bpf/libbpf/libbpf_prog_test.go b/bpf/libbpf/libbpf_prog_test.go index 7f3653df9..2b3b37841 100644 --- a/bpf/libbpf/libbpf_prog_test.go +++ b/bpf/libbpf/libbpf_prog_test.go @@ -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"], } ` |