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

Remove support for gnustl.

Browse Source 
Test: make checkbuild
Bug: None
Change-Id: Ifa457e9907e20bafa2885fbd6935d43b7f22aaaf
This commit is contained in:
Dan Albert
2017-12-20 15:51:30 -08:00
parent 68a7023436
commit c9460bbff8
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/ndk_prebuilt.go
View File

@@ -163,16 +163,13 @@ func ndkPrebuiltStaticStlFactory() android.Module {
return module.Init()
}
func getNdkStlLibDir(ctx android.ModuleContext, toolchain config.Toolchain, stl string) android.SourcePath {
gccVersion := toolchain.GccVersion()
func getNdkStlLibDir(ctx android.ModuleContext, stl string) android.SourcePath {
var libDir string
switch stl {
case "libstlport":
libDir = "cxx-stl/stlport/libs"
case "libc++":
libDir = "cxx-stl/llvm-libc++/libs"
case "libgnustl":
libDir = fmt.Sprintf("cxx-stl/gnu-libstdc++/%s/libs", gccVersion)
}
if libDir != "" {
@@ -201,6 +198,6 @@ func (ndk *ndkPrebuiltStlLinker) link(ctx ModuleContext, flags Flags,
stlName := strings.TrimSuffix(libName, "_shared")
stlName = strings.TrimSuffix(stlName, "_static")
libDir := getNdkStlLibDir(ctx, flags.Toolchain, stlName)
libDir := getNdkStlLibDir(ctx, stlName)
return libDir.Join(ctx, libName+libExt)
}