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

Merge "Remove early-return statements of link-type check"

Browse Source 
am: 18f568f651

Change-Id: I25d2c216ca28e3c543af59ecf99588b5ea4dadc4
This commit is contained in:
Inseob Kim
2018-04-11 16:25:02 -07:00
committed by android-build-merger
parent e56f26526c 18f568f651
commit 0221151a8d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/cc.go
View File

@@ -1115,17 +1115,11 @@ func checkLinkType(ctx android.ModuleContext, from *Module, to *Module, tag depe
toStl := to.stl.Properties.SelectedStl
if fromStl == "" || toStl == "" {
// Libraries that don't use the STL are unrestricted.
return
}
if fromStl == "ndk_system" || toStl == "ndk_system" {
} else if fromStl == "ndk_system" || toStl == "ndk_system" {
// We can be permissive with the system "STL" since it is only the C++
// ABI layer, but in the future we should make sure that everyone is
// using either libc++ or nothing.
return
}
if getNdkStlFamily(ctx, from) != getNdkStlFamily(ctx, to) {
} else if getNdkStlFamily(ctx, from) != getNdkStlFamily(ctx, to) {
ctx.ModuleErrorf("uses %q and depends on %q which uses incompatible %q",
from.stl.Properties.SelectedStl, ctx.OtherModuleName(to),
to.stl.Properties.SelectedStl)