Remove support for libstdc++ on Android/Linux/Darwin
It's now only supported on Windows, where we don't have libc++ support
yet.
Change-Id: I64891b7558d3d2942588687017a0c2f695c18d5c
diff --git a/cc/stl.go b/cc/stl.go
index c5dbae3..280beed 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -65,8 +65,7 @@
}
} else {
switch stl.Properties.Stl {
- case "libc++", "libc++_static",
- "libstdc++":
+ case "libc++", "libc++_static":
return stl.Properties.Stl
case "none":
return ""
@@ -87,9 +86,7 @@
func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
switch stl.Properties.SelectedStl {
case "libstdc++":
- if ctx.Device() {
- deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl)
- }
+ // Nothing
case "libc++", "libc++_static":
if stl.Properties.SelectedStl == "libc++" {
deps.SharedLibs = append(deps.SharedLibs, stl.Properties.SelectedStl)
@@ -143,16 +140,7 @@
}
}
case "libstdc++":
- // Using bionic's basic libstdc++. Not actually an STL. Only around until the
- // tree is in good enough shape to not need it.
- // Host builds will use GNU libstdc++.
- if ctx.Device() {
- flags.CFlags = append(flags.CFlags, "-I"+android.PathForSource(ctx, "bionic/libstdc++/include").String())
- } else {
- // Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else
- flags.CppFlags = append(flags.CppFlags, flags.Toolchain.SystemCppCppflags())
- flags.LdFlags = append(flags.LdFlags, flags.Toolchain.SystemCppLdflags())
- }
+ // Nothing
case "ndk_system":
ndkSrcRoot := android.PathForSource(ctx, "prebuilts/ndk/current/sources/cxx-stl/system/include")
flags.CFlags = append(flags.CFlags, "-isystem "+ndkSrcRoot.String())