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

Merge "Support missing a shared library variant."

Browse Source
This commit is contained in:
Nicolas Geoffray
2020-02-06 08:14:15 +00:00
committed by Gerrit Code Review
parent 22b08b4af6 0b78766fbc
commit 9acd7c3d36
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/cc.go
View File

@@ -1266,8 +1266,11 @@ func orderStaticModuleDeps(module LinkableInterface, staticDeps []LinkableInterf
allTransitiveDeps := make(map[android.Path][]android.Path, len(staticDeps))
staticDepFiles := []android.Path{}
for _, dep := range staticDeps {
allTransitiveDeps[dep.OutputFile().Path()] = dep.GetDepsInLinkOrder()
staticDepFiles = append(staticDepFiles, dep.OutputFile().Path())
// The OutputFile may not be valid for a variant not present, and the AllowMissingDependencies flag is set.
if dep.OutputFile().Valid() {
allTransitiveDeps[dep.OutputFile().Path()] = dep.GetDepsInLinkOrder()
staticDepFiles = append(staticDepFiles, dep.OutputFile().Path())
}
}
sharedDepFiles := []android.Path{}
for _, sharedDep := range sharedDeps {