openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Always respect system_shared_libs from Android.bp"

This commit is contained in:
Logan Chien 2019-01-19 02:34:34 +00:00 committed by Gerrit Code Review
parent f655b1db10 14bd0db2f7
commit 6af24f9677
1 changed files with 4 additions and 4 deletions
Show Stats 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")
}
var systemSharedLibs []string
if !ctx.useSdk() && !ctx.useVndk() {
systemSharedLibs = linker.Properties.System_shared_libs
}
systemSharedLibs := linker.Properties.System_shared_libs
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"}
}