StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "<apex_name>-deps-info correctly tracks dependencies"

Browse Source
This commit is contained in:
Jiyong Park
2020-02-12 00:47:21 +00:00
committed by Gerrit Code Review
parent 45f3c9b6a6 678c881a4f
commit 2bb26d3fad
6 changed files with 60 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apex/builder.go
View File

@@ -596,19 +596,14 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) {
return
}
internalDeps := a.internalDeps
externalDeps := a.externalDeps
internalDeps = android.SortedUniqueStrings(internalDeps)
externalDeps = android.SortedUniqueStrings(externalDeps)
externalDeps = android.RemoveListFromList(externalDeps, internalDeps)
var content strings.Builder
for _, name := range internalDeps {
fmt.Fprintf(&content, "internal %s\\n", name)
}
for _, name := range externalDeps {
fmt.Fprintf(&content, "external %s\\n", name)
for _, key := range android.SortedStringKeys(a.depInfos) {
info := a.depInfos[key]
toName := info.to
if info.isExternal {
toName = toName + " (external)"
}
fmt.Fprintf(&content, "%s <- %s\\n", toName, strings.Join(android.SortedUniqueStrings(info.from), ", "))
}
depsInfoFile := android.PathForOutput(ctx, a.Name()+"-deps-info.txt")