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

Always respect system_shared_libs from Android.bp

Browse Source 
This commit removes a special case that ignores `system_shared_libs`
when `sdk_version`, `vendor_available`, or `vendor` is specified.

In the past, that special case was required for `libasync_safe` and
`libpropertyinfoparser`.  However, ignoring `system_shared_libs` meant
that we didn't have a way to skip the default libs when `sdk_version`
was specified.  This becomes a problem when the dependencies of
prebuilts are actually checked.  To be specific,
`libclang_rt.builtins-${arch}` falls into circular dependencies.

Bug: 123006819
Test: make checkbuild
Change-Id: I5fe038c00892b3abe5189b30d57ba59884b47cbb
This commit is contained in:
Logan Chien
2019-01-15 21:12:43 +08:00
parent 18cc300204
commit 14bd0db2f7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/linker.go
View File

@@ -240,11 +240,11 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.LateStaticLibs = append(deps.LateStaticLibs, "libgcc") deps.LateStaticLibs = append(deps.LateStaticLibs, "libgcc")
} }
var systemSharedLibs []string systemSharedLibs := linker.Properties.System_shared_libs
if !ctx.useSdk() && !ctx.useVndk() {
systemSharedLibs = linker.Properties.System_shared_libs
}
if systemSharedLibs == nil { if systemSharedLibs == nil {
// Provide a default system_shared_libs if it is unspecified. Note: If an
// empty list [] is specified, it implies that the module declines the
// default system_shared_libs.
systemSharedLibs = []string{"libc", "libm", "libdl"} systemSharedLibs = []string{"libc", "libm", "libdl"}
} }