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

Add deps for system_shared_libs for all axes am: 561923e10d

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

Change-Id: I8c94c1b42c81efd43319a439a7e9042d3f125c4d
This commit is contained in:
Liz Kammer
2021-07-21 17:41:17 +00:00
committed by Automerger Merge Worker
parent 916f3b6bb1 561923e10d
commit 9919c2ea1a
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cc/bp2build.go
View File

@@ -72,36 +72,34 @@ func depsBp2BuildMutator(ctx android.BottomUpMutatorContext) {
allDeps = append(allDeps, baseLinkerProps.Whole_static_libs...) allDeps = append(allDeps, baseLinkerProps.Whole_static_libs...)
allDeps = append(allDeps, baseLinkerProps.Shared_libs...) allDeps = append(allDeps, baseLinkerProps.Shared_libs...)
allDeps = append(allDeps, baseLinkerProps.Exclude_shared_libs...) allDeps = append(allDeps, baseLinkerProps.Exclude_shared_libs...)
allDeps = append(allDeps, baseLinkerProps.System_shared_libs...)
} }
} }
} }
// Deps in the static: { .. } and shared: { .. } props of a cc_library. // Deps in the static: { .. } and shared: { .. } props of a cc_library.
if lib, ok := module.compiler.(*libraryDecorator); ok { if lib, ok := module.compiler.(*libraryDecorator); ok {
appendDeps := func(deps []string, p StaticOrSharedProperties) []string { appendDeps := func(deps []string, p StaticOrSharedProperties, system bool) []string {
deps = append(deps, p.Static_libs...) deps = append(deps, p.Static_libs...)
deps = append(deps, p.Whole_static_libs...) deps = append(deps, p.Whole_static_libs...)
deps = append(deps, p.Shared_libs...) deps = append(deps, p.Shared_libs...)
// TODO(b/186024507, b/186489250): Temporarily exclude adding
// system_shared_libs deps until libc and libm builds.
if system {
allDeps = append(allDeps, p.System_shared_libs...)
}
return deps return deps
} }
allDeps = appendDeps(allDeps, lib.SharedProperties.Shared) allDeps = appendDeps(allDeps, lib.SharedProperties.Shared, lib.shared())
allDeps = appendDeps(allDeps, lib.StaticProperties.Static) allDeps = appendDeps(allDeps, lib.StaticProperties.Static, lib.static())
// TODO(b/186024507, b/186489250): Temporarily exclude adding
// system_shared_libs deps until libc and libm builds.
if lib.static() {
allDeps = append(allDeps, lib.StaticProperties.Static.System_shared_libs...)
} else if lib.shared() {
allDeps = append(allDeps, lib.SharedProperties.Shared.System_shared_libs...)
}
// Deps in the target/arch nested static: { .. } and shared: { .. } props of a cc_library. // Deps in the target/arch nested static: { .. } and shared: { .. } props of a cc_library.
// target: { <target>: shared: { ... } } // target: { <target>: shared: { ... } }
for _, configToProps := range module.GetArchVariantProperties(ctx, &SharedProperties{}) { for _, configToProps := range module.GetArchVariantProperties(ctx, &SharedProperties{}) {
for _, props := range configToProps { for _, props := range configToProps {
if p, ok := props.(*SharedProperties); ok { if p, ok := props.(*SharedProperties); ok {
allDeps = appendDeps(allDeps, p.Shared) allDeps = appendDeps(allDeps, p.Shared, lib.shared())
} }
} }
} }
@@ -109,7 +107,7 @@ func depsBp2BuildMutator(ctx android.BottomUpMutatorContext) {
for _, configToProps := range module.GetArchVariantProperties(ctx, &StaticProperties{}) { for _, configToProps := range module.GetArchVariantProperties(ctx, &StaticProperties{}) {
for _, props := range configToProps { for _, props := range configToProps {
if p, ok := props.(*StaticProperties); ok { if p, ok := props.(*StaticProperties); ok {
allDeps = appendDeps(allDeps, p.Static) allDeps = appendDeps(allDeps, p.Static, lib.static())
} }
} }
} }