aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2024-02-12 19:55:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-12 19:55:21 +0000
commit6dacd69f653c5b40194e65c0d0652438af964165 (patch)
tree4c77250bcbed8c5131b7bd30b1b1b10a7867e1a8
parentb4058b4182a229c70cdbf195d84e527124fa2a9f (diff)
parentc7ec11755669f86e2efcf2ab5d10c604f4abd6e5 (diff)
downloadblueprint-6dacd69f653c5b40194e65c0d0652438af964165.tar.gz
Add tag data to soong-debug-info.json. am: c7ec117556
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2956143 Change-Id: Id701b9172a56db6780c1e1e899569e6bec689cc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--context.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/context.go b/context.go
index d2adf3a..23e45e8 100644
--- a/context.go
+++ b/context.go
@@ -4955,16 +4955,17 @@ func funcName(f interface{}) string {
// json representation of a dependency
type depJson struct {
- Name string `json:"name"`
- Variant string `json:"variant"`
- TagType string `json:"tag_type,omitempty"`
+ Name string `json:"name"`
+ Variant string `json:"variant"`
+ TagType string `json:"tag_type"`
+ TagData interface{} `json:"tag_data"`
}
// json representation of a provider
type providerJson struct {
- Type string `json:"type,omitempty"`
- Debug string `json:"debug,omitempty"` // from GetDebugString on the provider data
- Fields interface{} `json:"fields,omitempty"`
+ Type string `json:"type"`
+ Debug string `json:"debug"` // from GetDebugString on the provider data
+ Fields interface{} `json:"fields"`
}
// interface for getting debug info from various data.
@@ -5090,6 +5091,7 @@ func getModuleDebugJson(module *moduleInfo) []byte {
t := reflect.TypeOf(dep.tag)
if t != nil {
result[i].TagType = t.PkgPath() + "." + t.Name()
+ result[i].TagData = debugPropertyMap(reflect.ValueOf(dep.tag))
}
}
return result