tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disallow using stlport.

Browse source 
See https://android-review.googlesource.com/149486

Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26
This commit is contained in:
Dan Willemsen 2015-09-11 17:41:30 -07:00
parent 3bf6b47229
commit fa3924e480
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cc/cc.go
View file

@ -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":