Snap for 9905984 from 10b9f13f96f5f2b2279b2d6624507ae9ca75a753 to udc-release am: 880b9b479e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/22539007
Change-Id: Ia127478ba339235379f772bc1621cebf75baaed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/context.go b/context.go
index 46c4e1a..54f2fd8 100644
--- a/context.go
+++ b/context.go
@@ -2679,6 +2679,7 @@
type jsonModuleName struct {
Name string
+ Variant string
Variations jsonVariations
DependencyVariations jsonVariations
}
@@ -2714,6 +2715,7 @@
func jsonModuleNameFromModuleInfo(m *moduleInfo) *jsonModuleName {
return &jsonModuleName{
Name: m.Name(),
+ Variant: m.variant.name,
Variations: toJsonVariationMap(m.variant.variations),
DependencyVariations: toJsonVariationMap(m.variant.dependencyVariations),
}
@@ -2761,7 +2763,8 @@
func jsonModuleWithActionsFromModuleInfo(m *moduleInfo) *JsonModule {
result := &JsonModule{
jsonModuleName: jsonModuleName{
- Name: m.Name(),
+ Name: m.Name(),
+ Variant: m.variant.name,
},
Deps: make([]jsonDep, 0),
Type: m.typeName,
