tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 9acd7c3d36
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cc/cc.go
View file

@ -1266,9 +1266,12 @@ func orderStaticModuleDeps(module LinkableInterface, staticDeps []LinkableInterf
allTransitiveDeps := make(map[android.Path][]android.Path, len(staticDeps)) allTransitiveDeps := make(map[android.Path][]android.Path, len(staticDeps))
staticDepFiles := []android.Path{} staticDepFiles := []android.Path{}
for _, dep := range staticDeps { for _, dep := range staticDeps {
// 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() allTransitiveDeps[dep.OutputFile().Path()] = dep.GetDepsInLinkOrder()
staticDepFiles = append(staticDepFiles, dep.OutputFile().Path()) staticDepFiles = append(staticDepFiles, dep.OutputFile().Path())
} }
}
sharedDepFiles := []android.Path{} sharedDepFiles := []android.Path{}
for _, sharedDep := range sharedDeps { for _, sharedDep := range sharedDeps {
if sharedDep.HasStaticVariant() { if sharedDep.HasStaticVariant() {