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

Merge "Do not explicitly link ucrt, ucrtbase" am: c6453295a2 am: f035f6f5f6

Browse source 
Change-Id: I3448637762f9fe25779c02830a53509f03ab87a5
This commit is contained in:
Automerger Merge Worker 2020-03-07 21:49:31 +00:00
commit 9a2d6f4d18
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cc/stl.go
View file

@ -235,11 +235,6 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
flags.Local.CppFlags = append(flags.Local.CppFlags, "-nostdinc++")
flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")
if ctx.Windows() {
if stl.Properties.SelectedStl == "libc++_static" {
// These are transitively needed by libc++_static.
flags.extraLibFlags = append(flags.extraLibFlags,
"-lmsvcrt", "-lucrt")
}
// Use SjLj exceptions for 32-bit. libgcc_eh implements SjLj
// exception model for 32-bit.
if ctx.Arch().ArchType == android.X86 {