diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 22:40:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-22 22:40:31 +0000 |
| commit | 277303f042e84a47cd2196126c9d85b05b3cf5c2 (patch) | |
| tree | 091a6e5dcbc4bdd769124be156950ca0cb8e3192 /filesystem | |
| parent | a61a042fa667a74034f2310a8807f2a5fd98a305 (diff) | |
| parent | aa2555387d214fc0292406d10714558054d794f3 (diff) | |
Merge "Add ctx to AndroidMkExtraEntriesFunc"
Diffstat (limited to 'filesystem')
| -rw-r--r-- | filesystem/bootimg.go | 2 | ||||
| -rw-r--r-- | filesystem/filesystem.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filesystem/bootimg.go b/filesystem/bootimg.go index c90929ae9..29e83da07 100644 --- a/filesystem/bootimg.go +++ b/filesystem/bootimg.go @@ -211,7 +211,7 @@ func (b *bootimg) AndroidMkEntries() []android.AndroidMkEntries { Class: "ETC", OutputFile: android.OptionalPathForPath(b.output), ExtraEntries: []android.AndroidMkExtraEntriesFunc{ - func(entries *android.AndroidMkEntries) { + func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.SetString("LOCAL_MODULE_PATH", b.installDir.ToMakePath().String()) entries.SetString("LOCAL_INSTALLED_MODULE_STEM", b.installFileName()) }, diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 3bccde9eb..3b0a7ae5a 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -358,7 +358,7 @@ func (f *filesystem) AndroidMkEntries() []android.AndroidMkEntries { Class: "ETC", OutputFile: android.OptionalPathForPath(f.output), ExtraEntries: []android.AndroidMkExtraEntriesFunc{ - func(entries *android.AndroidMkEntries) { + func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.SetString("LOCAL_MODULE_PATH", f.installDir.ToMakePath().String()) entries.SetString("LOCAL_INSTALLED_MODULE_STEM", f.installFileName()) }, |