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 "Skip default dependencies for header libraries" am: 4ba70ab48e am: e125ff0d7b am: ec17b78b49 

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

Change-Id: Ica73f6d083258d9ced85ee4a25f6f5a7e3715aeb
This commit is contained in:
Colin Cross 2021-04-27 17:42:49 +00:00 committed by Automerger Merge Worker
parent ae5453f6ad ec17b78b49
commit 8b4fe4fc08
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc/linker.go
View File

@ -322,7 +322,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
if ctx.toolchain().Bionic() {
// libclang_rt.builtins has to be last on the command line
if !Bool(linker.Properties.No_libcrt) {
if !Bool(linker.Properties.No_libcrt) && !ctx.header() {
deps.LateStaticLibs = append(deps.LateStaticLibs, config.BuiltinsRuntimeLibrary(ctx.toolchain()))
}

2
cc/stl.go
View File

@ -62,6 +62,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
s := ""
if stl.Properties.Stl != nil {
s = *stl.Properties.Stl
} else if ctx.header() {
s = "none"
}
if ctx.useSdk() && ctx.Device() {
switch s {