commit f79fee864c4c5dfa1acd689738b7de3cf04cd6c0
author Colin Cross <ccross@android.com> Fri Jul 03 13:18:24 2020 -0700
committer Colin Cross <ccross@android.com> Wed Feb 17 15:24:43 2021 -0800
tree cbb2f6905ee7c274836e0060049c57f621d4d010
parent f7101aee5c3e9ddc9d241bb6e0d259932bd77237

Add ctx to AndroidMkExtraEntriesFunc

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

Bug: 180540739
Test: m checkbuild
Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc

apex/prebuilt.go

diff --git a/apex/prebuilt.go b/apex/prebuilt.go
index 4b22e0f..6292da6 100644
--- a/apex/prebuilt.go
+++ b/apex/prebuilt.go
@@ -413,7 +413,7 @@
 		OutputFile: android.OptionalPathForPath(p.inputApex),
 		Include:    "$(BUILD_PREBUILT)",
 		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
-			func(entries *android.AndroidMkEntries) {
+			func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
 				entries.SetString("LOCAL_MODULE_PATH", p.installDir.ToMakePath().String())
 				entries.SetString("LOCAL_MODULE_STEM", p.installFilename)
 				entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !p.installable())
@@ -585,7 +585,7 @@
 		OutputFile: android.OptionalPathForPath(a.outputApex),
 		Include:    "$(BUILD_PREBUILT)",
 		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
-			func(entries *android.AndroidMkEntries) {
+			func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
 				entries.SetString("LOCAL_MODULE_PATH", a.installDir.ToMakePath().String())
 				entries.SetString("LOCAL_MODULE_STEM", a.installFilename)
 				entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !a.installable())