Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988 am: 62539c2872 am: 3fe1cc8006 am: e681a108f9

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

Change-Id: I460510263d1aaeb53b730b25389940fec0b96205
This commit is contained in:
Treehugger Robot
2021-11-03 16:48:48 +00:00
committed by Automerger Merge Worker
6 changed files with 118 additions and 83 deletions

View File

@@ -500,7 +500,7 @@ type ProductConfigProperties map[string]map[string]ProductConfigProperty
// ProductVariableProperties returns a ProductConfigProperties containing only the properties which
// have been set for the module in the given context.
func ProductVariableProperties(ctx BaseMutatorContext) ProductConfigProperties {
func ProductVariableProperties(ctx BazelConversionPathContext) ProductConfigProperties {
module := ctx.Module()
moduleBase := module.base()