diff options
| author | 2020-12-07 10:23:54 -0800 | |
|---|---|---|
| committer | 2020-12-07 10:23:54 -0800 | |
| commit | 02b11a6035cafa7652faa0ceb17cb1d893a38c62 (patch) | |
| tree | ab63dc18ce788f69308a7b3d6b74b6a8bd96a0e4 /java | |
| parent | 2ba87f466c3af3ffdf2b925520c4d4e45a3f5aba (diff) | |
Remove AndroidMkExtraFootersFunc entries param.
I added in case anyone needs to access AndroidMkEntries to generate
footer lines, but nobody uses it, and it only confuses people.
Test: m nothing, TreeHugger
Change-Id: Ic8a450e3c306d9228c1fdec212c7441bd6aaee03
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 8 | ||||
| -rw-r--r-- | java/robolectric.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index fc573c8b6..aaad44f72 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -274,7 +274,7 @@ func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries { }, }, ExtraFooters: []android.AndroidMkExtraFootersFunc{ - func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) { + func(w io.Writer, name, prefix, moduleDir string) { fmt.Fprintln(w, "jar_installed_module := $(LOCAL_INSTALLED_MODULE)") }, }, @@ -289,7 +289,7 @@ func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries { }, }, ExtraFooters: []android.AndroidMkExtraFootersFunc{ - func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) { + func(w io.Writer, name, prefix, moduleDir string) { // Ensure that the wrapper script timestamp is always updated when the jar is updated fmt.Fprintln(w, "$(LOCAL_INSTALLED_MODULE): $(jar_installed_module)") fmt.Fprintln(w, "jar_installed_module :=") @@ -393,7 +393,7 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { }, }, ExtraFooters: []android.AndroidMkExtraFootersFunc{ - func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) { + func(w io.Writer, name, prefix, moduleDir string) { if app.noticeOutputs.Merged.Valid() { fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", app.installApkName, app.noticeOutputs.Merged.String(), app.installApkName+"_NOTICE") @@ -548,7 +548,7 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries { }, }, ExtraFooters: []android.AndroidMkExtraFootersFunc{ - func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) { + func(w io.Writer, name, prefix, moduleDir string) { if dstubs.apiFile != nil { fmt.Fprintf(w, ".PHONY: %s %s.txt\n", dstubs.Name(), dstubs.Name()) fmt.Fprintf(w, "%s %s.txt: %s\n", dstubs.Name(), dstubs.Name(), dstubs.apiFile) diff --git a/java/robolectric.go b/java/robolectric.go index 419efda88..c821e5bd3 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -260,7 +260,7 @@ func (r *robolectricTest) AndroidMkEntries() []android.AndroidMkEntries { entries := &entriesList[0] entries.ExtraFooters = []android.AndroidMkExtraFootersFunc{ - func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) { + func(w io.Writer, name, prefix, moduleDir string) { if s := r.robolectricProperties.Test_options.Shards; s != nil && *s > 1 { numShards := int(*s) shardSize := (len(r.tests) + numShards - 1) / numShards |