Merge "Dump extra JSON data for C++ modules and ApexInfo." am: 141fbad0e4 am: 3f5770c5a7

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

Change-Id: I08cafbda9baa1898562d8d70602bb6b05320c1f8

android/apex.go

@@ -91,6 +91,16 @@ type ApexInfo struct {
 
 var ApexInfoProvider = blueprint.NewMutatorProvider(ApexInfo{}, "apex")
 
+func (i ApexInfo) AddJSONData(d *map[string]interface{}) {
+	(*d)["Apex"] = map[string]interface{}{
+		"ApexVariationName": i.ApexVariationName,
+		"MinSdkVersion":     i.MinSdkVersion,
+		"InApexModules":     i.InApexModules,
+		"InApexVariants":    i.InApexVariants,
+		"ForPrebuiltApex":   i.ForPrebuiltApex,
+	}
+}
+
 // mergedName gives the name of the alias variation that will be used when multiple apex variations
 // of a module can be deduped into one variation. For example, if libfoo is included in both apex.a
 // and apex.b, and if the two APEXes have the same min_sdk_version (say 29), then libfoo doesn't