diff options
| author | 2021-01-06 19:17:45 +0000 | |
|---|---|---|
| committer | 2021-01-06 19:17:45 +0000 | |
| commit | a1b87c81cae812c74721322cc4dca8a5b836d060 (patch) | |
| tree | b02182bd2063abed58eb6b1b671d1934d2592b4c /bpf/bpf.go | |
| parent | 659f11fcfcc55f97b5d6ca6e75668fecbeaa01c3 (diff) | |
| parent | df98d3e4a546a3a3e5e6aba5ca6151d00547ef20 (diff) | |
Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV"
* changes:
Revert "Add ability to declare licenses in soong."
Revert "Export soong license data to make."
Revert "Define the standard license_kind rules."
Diffstat (limited to 'bpf/bpf.go')
| -rw-r--r-- | bpf/bpf.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/bpf/bpf.go b/bpf/bpf.go index 8142f10a5..297e13a4f 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -120,7 +120,6 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { names = append(names, objName) fmt.Fprintln(w, "include $(CLEAR_VARS)") fmt.Fprintln(w, "LOCAL_MODULE := ", objName) - data.Entries.WriteLicenseVariables(w) fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", obj.String()) fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", obj.Base()) fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC") @@ -130,7 +129,6 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { } fmt.Fprintln(w, "include $(CLEAR_VARS)") fmt.Fprintln(w, "LOCAL_MODULE := ", name) - data.Entries.WriteLicenseVariables(w) fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES :=", strings.Join(names, " ")) fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)") }, |