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

2
cc/library.go
View File

@@ -579,7 +579,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
// TODO(danalbert): Clean this up when soong supports prebuilts. // TODO(danalbert): Clean this up when soong supports prebuilts.
if strings.HasPrefix(ctx.selectedStl(), "ndk_libc++") { if strings.HasPrefix(ctx.selectedStl(), "ndk_libc++") {
libDir := getNdkStlLibDir(ctx, flags.Toolchain, "libc++") libDir := getNdkStlLibDir(ctx, "libc++")
if strings.HasSuffix(ctx.selectedStl(), "_shared") { if strings.HasSuffix(ctx.selectedStl(), "_shared") {
deps.StaticLibs = append(deps.StaticLibs, deps.StaticLibs = append(deps.StaticLibs,

7
cc/ndk_prebuilt.go
View File

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

9
cc/stl.go
View File

@@ -26,8 +26,6 @@ func getNdkStlFamily(ctx android.ModuleContext, m *Module) string {
return "libc++" return "libc++"
case "ndk_libstlport_shared", "ndk_libstlport_static": case "ndk_libstlport_shared", "ndk_libstlport_static":
return "stlport" return "stlport"
case "ndk_libgnustl_static":
return "gnustl"
case "ndk_system": case "ndk_system":
return "system" return "system"
case "": case "":
@@ -66,8 +64,7 @@ func (stl *stl) begin(ctx BaseModuleContext) {
case "": case "":
return "ndk_system" return "ndk_system"
case "c++_shared", "c++_static", case "c++_shared", "c++_static",
"stlport_shared", "stlport_static", "stlport_shared", "stlport_static":
"gnustl_static":
return "ndk_lib" + s return "ndk_lib" + s
case "libc++": case "libc++":
return "ndk_libc++_shared" return "ndk_libc++_shared"
@@ -137,7 +134,7 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
deps.SharedLibs = append([]string{"libstdc++"}, deps.SharedLibs...) deps.SharedLibs = append([]string{"libstdc++"}, deps.SharedLibs...)
case "ndk_libc++_shared", "ndk_libstlport_shared": case "ndk_libc++_shared", "ndk_libstlport_shared":
deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl) deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl)
case "ndk_libc++_static", "ndk_libstlport_static", "ndk_libgnustl_static": case "ndk_libc++_static", "ndk_libstlport_static":
deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl) deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl)
default: default:
panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl)) panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))
@@ -171,7 +168,7 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
case "ndk_libc++_shared", "ndk_libc++_static": case "ndk_libc++_shared", "ndk_libc++_static":
// TODO(danalbert): This really shouldn't be here... // TODO(danalbert): This really shouldn't be here...
flags.CppFlags = append(flags.CppFlags, "-std=c++11") flags.CppFlags = append(flags.CppFlags, "-std=c++11")
case "ndk_libstlport_shared", "ndk_libstlport_static", "ndk_libgnustl_static": case "ndk_libstlport_shared", "ndk_libstlport_static":
// Nothing // Nothing
case "": case "":
// None or error. // None or error.

2
cc/test.go
View File

@@ -161,8 +161,6 @@ func (test *testDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
switch ctx.selectedStl() { switch ctx.selectedStl() {
case "ndk_libc++_shared", "ndk_libc++_static": case "ndk_libc++_shared", "ndk_libc++_static":
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_libcxx", "libgtest_ndk_libcxx") deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_libcxx", "libgtest_ndk_libcxx")
case "ndk_libgnustl_static":
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_gnustl", "libgtest_ndk_gnustl")
default: default:
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk", "libgtest_ndk") deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk", "libgtest_ndk")
} }