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

Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate

Browse source 
Bug: 273282046
Test: m --ninja_weight_source=ninja_log
Change-Id: I3f35406a7334f737ea010d5453c85e5f2d993708
This commit is contained in:
Jeongik Cha 2023-04-08 02:14:07 +09:00
parent aefc0a9b9b
commit 2621c909e5
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
context.go
View file

@ -2806,19 +2806,24 @@ func getNinjaStringsWithNilPkgNames(nStrs []ninjaString) []string {
return strs return strs
} }
func (c *Context) GetOutputsFromModuleNames(moduleNames []string) map[string][]string { func (c *Context) GetWeightedOutputsFromPredicate(predicate func(*JsonModule) (bool, int)) map[string]int {
modulesToOutputs := make(map[string][]string) outputToWeight := make(map[string]int)
for _, m := range c.modulesSorted { for _, m := range c.modulesSorted {
if inList(m.Name(), moduleNames) { jmWithActions := jsonModuleWithActionsFromModuleInfo(m)
jmWithActions := jsonModuleWithActionsFromModuleInfo(m) if ok, weight := predicate(jmWithActions); ok {
for _, a := range jmWithActions.Module["Actions"].([]JSONAction) { for _, a := range jmWithActions.Module["Actions"].([]JSONAction) {
modulesToOutputs[m.Name()] = append(modulesToOutputs[m.Name()], a.Outputs...) for _, o := range a.Outputs {
if val, ok := outputToWeight[o]; ok {
if val > weight {
continue
}
}
outputToWeight[o] = weight
}
} }
// There could be several modules with the same name, so keep looping
} }
} }
return outputToWeight
return modulesToOutputs
} }
func inList(s string, l []string) bool { func inList(s string, l []string) bool {