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

Merge "Remove support for gnustl."

Browse Source
This commit is contained in:
Treehugger Robot
2018-01-06 01:12:21 +00:00
committed by Gerrit Code Review
parent aa92b80bc3 c9460bbff8
commit 0a8a2720e2
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.
if strings.HasPrefix(ctx.selectedStl(), "ndk_libc++") {
libDir := getNdkStlLibDir(ctx, flags.Toolchain, "libc++")
libDir := getNdkStlLibDir(ctx, "libc++")
if strings.HasSuffix(ctx.selectedStl(), "_shared") {
deps.StaticLibs = append(deps.StaticLibs,

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)
}

9
cc/stl.go
View File

@@ -26,8 +26,6 @@ func getNdkStlFamily(ctx android.ModuleContext, m *Module) string {
return "libc++"
case "ndk_libstlport_shared", "ndk_libstlport_static":
return "stlport"
case "ndk_libgnustl_static":
return "gnustl"
case "ndk_system":
return "system"
case "":
@@ -66,8 +64,7 @@ func (stl *stl) begin(ctx BaseModuleContext) {
case "":
return "ndk_system"
case "c++_shared", "c++_static",
"stlport_shared", "stlport_static",
"gnustl_static":
"stlport_shared", "stlport_static":
return "ndk_lib" + s
case "libc++":
return "ndk_libc++_shared"
@@ -137,7 +134,7 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
deps.SharedLibs = append([]string{"libstdc++"}, deps.SharedLibs...)
case "ndk_libc++_shared", "ndk_libstlport_shared":
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)
default:
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":
// TODO(danalbert): This really shouldn't be here...
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
case "":
// 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() {
case "ndk_libc++_shared", "ndk_libc++_static":
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:
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk", "libgtest_ndk")
}