tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add sdk version workaround for libclang_rt"

Browse source
This commit is contained in:
Logan Chien 2019-01-22 01:04:35 +00:00 committed by Gerrit Code Review
commit 5c7c78a2e0
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cc/cc.go
View file

@ -1315,6 +1315,13 @@ func checkLinkType(ctx android.ModuleContext, from *Module, to *Module, tag depe
// the NDK. // the NDK.
return return
} }
if strings.HasPrefix(ctx.ModuleName(), "libclang_rt.") && to.Name() == "libc++" {
// Bug: http://b/121358700 - Allow libclang_rt.* shared libraries (with sdk_version)
// to link to libc++ (non-NDK and without sdk_version).
return
}
if String(to.Properties.Sdk_version) == "" { if String(to.Properties.Sdk_version) == "" {
// NDK code linking to platform code is never okay. // NDK code linking to platform code is never okay.
ctx.ModuleErrorf("depends on non-NDK-built library %q", ctx.ModuleErrorf("depends on non-NDK-built library %q",