tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: Ic3107e1b9cbe71e9e77528827624e21dee0b5526
This commit is contained in:
Lukács T. Berki 2021-06-25 11:13:59 +00:00 committed by Automerger Merge Worker
commit 3f5770c5a7
3 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/apex.go
View file

@ -87,6 +87,16 @@ type ApexInfo struct {
var ApexInfoProvider = blueprint.NewMutatorProvider(ApexInfo{}, "apex") 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 // 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 // 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 // and apex.b, and if the two APEXes have the same min_sdk_version (say 29), then libfoo doesn't

4
android/module.go
View file

@ -1190,6 +1190,10 @@ type ModuleBase struct {
vintfFragmentsPaths Paths vintfFragmentsPaths Paths
} }
func (m *ModuleBase) AddJSONData(d *map[string]interface{}) {
(*d)["Android"] = map[string]interface{}{}
}
func (m *ModuleBase) ComponentDepsMutator(BottomUpMutatorContext) {} func (m *ModuleBase) ComponentDepsMutator(BottomUpMutatorContext) {}
func (m *ModuleBase) DepsMutator(BottomUpMutatorContext) {} func (m *ModuleBase) DepsMutator(BottomUpMutatorContext) {}

40
cc/cc.go
View file

@ -831,6 +831,46 @@ type Module struct {
hideApexVariantFromMake bool hideApexVariantFromMake bool
} }
func (c *Module) AddJSONData(d *map[string]interface{}) {
c.AndroidModuleBase().AddJSONData(d)
(*d)["Cc"] = map[string]interface{}{
"SdkVersion": c.SdkVersion(),
"MinSdkVersion": c.MinSdkVersion(),
"VndkVersion": c.VndkVersion(),
"ProductSpecific": c.ProductSpecific(),
"SocSpecific": c.SocSpecific(),
"DeviceSpecific": c.DeviceSpecific(),
"InProduct": c.InProduct(),
"InVendor": c.InVendor(),
"InRamdisk": c.InRamdisk(),
"InVendorRamdisk": c.InVendorRamdisk(),
"InRecovery": c.InRecovery(),
"VendorAvailable": c.VendorAvailable(),
"ProductAvailable": c.ProductAvailable(),
"RamdiskAvailable": c.RamdiskAvailable(),
"VendorRamdiskAvailable": c.VendorRamdiskAvailable(),
"RecoveryAvailable": c.RecoveryAvailable(),
"OdmAvailable": c.OdmAvailable(),
"InstallInData": c.InstallInData(),
"InstallInRamdisk": c.InstallInRamdisk(),
"InstallInSanitizerDir": c.InstallInSanitizerDir(),
"InstallInVendorRamdisk": c.InstallInVendorRamdisk(),
"InstallInRecovery": c.InstallInRecovery(),
"InstallInRoot": c.InstallInRoot(),
"IsVndk": c.IsVndk(),
"IsVndkExt": c.IsVndkExt(),
"IsVndkPrivate": c.IsVndkPrivate(),
"IsVndkSp": c.IsVndkSp(),
"IsLlndk": c.IsLlndk(),
"IsLlndkPublic": c.IsLlndkPublic(),
"IsSnapshotLibrary": c.IsSnapshotLibrary(),
"IsSnapshotPrebuilt": c.IsSnapshotPrebuilt(),
"IsVendorPublicLibrary": c.IsVendorPublicLibrary(),
"ApexSdkVersion": c.apexSdkVersion,
"TestFor": c.TestFor(),
}
}
func (c *Module) SetPreventInstall() { func (c *Module) SetPreventInstall() {
c.Properties.PreventInstall = true c.Properties.PreventInstall = true
} }