Remove support for stlport.
Test: make checkbuild
Bug: None
Change-Id: I066574dd623ddd617f7cdbabbb16e01ece0b4cdc
diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go
index de1fa46..7e8d989 100644
--- a/cc/ndk_prebuilt.go
+++ b/cc/ndk_prebuilt.go
@@ -164,21 +164,9 @@
}
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"
- }
-
- if libDir != "" {
- ndkSrcRoot := "prebuilts/ndk/current/sources"
- return android.PathForSource(ctx, ndkSrcRoot).Join(ctx, libDir, ctx.Arch().Abi[0])
- }
-
- ctx.ModuleErrorf("Unknown NDK STL: %s", stl)
- return android.PathForSource(ctx, "")
+ libDir := "cxx-stl/llvm-libc++/libs"
+ ndkSrcRoot := "prebuilts/ndk/current/sources"
+ return android.PathForSource(ctx, ndkSrcRoot).Join(ctx, libDir, ctx.Arch().Abi[0])
}
func (ndk *ndkPrebuiltStlLinker) link(ctx ModuleContext, flags Flags,