StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add information about what module produced a certain androidmk entry" am: 50ffead8fe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454749

Change-Id: Ibdd163d260b50b1c6f09537b56d1aa0a6e91b30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-24 08:29:19 +00:00
committed by Automerger Merge Worker
parent 71f3b7673f 50ffead8fe
commit 9bdba901bb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/androidmk.go
View File

@@ -501,6 +501,7 @@ func (a *AndroidMkEntries) WriteLicenseVariables(w io.Writer) {
// generate and fill in AndroidMkEntries's in-struct data, ready to be flushed to a file. // generate and fill in AndroidMkEntries's in-struct data, ready to be flushed to a file.
type fillInEntriesContext interface { type fillInEntriesContext interface {
ModuleDir(module blueprint.Module) string ModuleDir(module blueprint.Module) string
ModuleSubDir(module blueprint.Module) string
Config() Config Config() Config
ModuleProvider(module blueprint.Module, provider blueprint.ProviderKey) interface{} ModuleProvider(module blueprint.Module, provider blueprint.ProviderKey) interface{}
ModuleHasProvider(module blueprint.Module, provider blueprint.ProviderKey) bool ModuleHasProvider(module blueprint.Module, provider blueprint.ProviderKey) bool
@@ -528,7 +529,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
fmt.Fprintf(&a.header, distString) fmt.Fprintf(&a.header, distString)
} }
fmt.Fprintln(&a.header, "\ninclude $(CLEAR_VARS) # "+ctx.ModuleType(mod)) fmt.Fprintf(&a.header, "\ninclude $(CLEAR_VARS) # type: %s, name: %s, variant: %s\n", ctx.ModuleType(mod), base.BaseModuleName(), ctx.ModuleSubDir(mod))
// Collect make variable assignment entries. // Collect make variable assignment entries.
a.SetString("LOCAL_PATH", ctx.ModuleDir(mod)) a.SetString("LOCAL_PATH", ctx.ModuleDir(mod))