diff options
| author | 2022-01-19 09:41:57 +0000 | |
|---|---|---|
| committer | 2022-01-19 09:41:57 +0000 | |
| commit | a9a5d368842fc69acfda7bd76e540a8c766be5cd (patch) | |
| tree | 7708976429ea807988800e873e34a72ab2c1f269 /bpf/bpf.go | |
| parent | 3ae0b5a7c1278638795a6b3b0c41e7ae7d4409bc (diff) | |
| parent | fad7f9d8b722c7270e3e3ead31bc43f87101cd9d (diff) | |
Merge "[NETD-BPF#34] Add a tag for bpf to specify the install folder"
Diffstat (limited to 'bpf/bpf.go')
| -rw-r--r-- | bpf/bpf.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/bpf/bpf.go b/bpf/bpf.go index 9f0c86ce2..187b4db61 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -54,12 +54,16 @@ type BpfModule interface { android.Module OutputFiles(tag string) (android.Paths, error) + + // Returns the sub install directory if the bpf module is included by apex. + SubDir() string } type BpfProperties struct { Srcs []string `android:"path"` Cflags []string Include_dirs []string + Sub_dir string } type bpf struct { @@ -121,6 +125,10 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { fmt.Fprintln(w) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w) + localModulePath := "LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/bpf" + if len(bpf.properties.Sub_dir) > 0 { + localModulePath += "/" + bpf.properties.Sub_dir + } for _, obj := range bpf.objs { objName := name + "_" + obj.Base() names = append(names, objName) @@ -130,7 +138,7 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", obj.String()) fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", obj.Base()) fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC") - fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/bpf") + fmt.Fprintln(w, localModulePath) fmt.Fprintln(w, "include $(BUILD_PREBUILT)") fmt.Fprintln(w) } @@ -154,6 +162,10 @@ func (bpf *bpf) OutputFiles(tag string) (android.Paths, error) { } } +func (bpf *bpf) SubDir() string { + return bpf.properties.Sub_dir +} + var _ android.OutputFileProducer = (*bpf)(nil) func BpfFactory() android.Module { |