commit aa2555387d214fc0292406d10714558054d794f3
author Colin Cross <ccross@android.com> Fri Jul 03 13:18:24 2020 -0700
committer Colin Cross <ccross@android.com> Fri Feb 19 23:05:40 2021 +0000
tree 3ce6d4a024407fa9520c98c24b62c6534d62a021
parent a6cfcac7279755c76ab742f21e29f0ab3de2c7ea

Add ctx to AndroidMkExtraEntriesFunc

Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to
access providers.

Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc
Merged-In: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc

etc/prebuilt_etc.go

diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go
index 850c8f9..1e938ad 100644
--- a/etc/prebuilt_etc.go
+++ b/etc/prebuilt_etc.go
@@ -293,7 +293,7 @@
 		SubName:    nameSuffix,
 		OutputFile: android.OptionalPathForPath(p.outputFilePath),
 		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
-			func(entries *android.AndroidMkEntries) {
+			func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
 				entries.SetString("LOCAL_MODULE_TAGS", "optional")
 				entries.SetString("LOCAL_MODULE_PATH", p.installDirPath.ToMakePath().String())
 				entries.SetString("LOCAL_INSTALLED_MODULE_STEM", p.outputFilePath.Base())