From fa3924e4801bb03d7a285a64463b824e9a532990 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 11 Sep 2015 17:41:30 -0700 Subject: [PATCH] Disallow using stlport. See https://android-review.googlesource.com/149486 Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26 --- cc/cc.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cc/cc.go b/cc/cc.go index f91808703..99d462212 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -791,7 +791,6 @@ func (c *CCLinked) stl(ctx common.AndroidBaseContext) string { switch c.Properties.Stl { case "libc++", "libc++_static", - "stlport", "stlport_static", "libstdc++": return c.Properties.Stl case "none": @@ -844,13 +843,6 @@ func (c *CCLinked) flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags flags.LdFlags = append(flags.LdFlags, "-Wl,--exclude-libs,libunwind_llvm.a") } } - case "stlport", "stlport_static": - if ctx.Device() { - flags.CFlags = append(flags.CFlags, - "-I${SrcDir}/external/stlport/stlport", - "-I${SrcDir}/bionic/libstdc++/include", - "-I${SrcDir}/bionic") - } 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. @@ -913,10 +905,6 @@ func (c *CCLinked) depNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDe depNames.SharedLibs = append(depNames.SharedLibs, "libdl") } } - case "stlport": - depNames.SharedLibs = append(depNames.SharedLibs, "libstdc++", "libstlport") - case "stlport_static": - depNames.StaticLibs = append(depNames.StaticLibs, "libstdc++", "libstlport_static") case "": // None or error. case "ndk_system":