Merge "Revert "Do not build tests with ThinLTO"" am: a471535c72

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874098

Change-Id: If0c43fa11b2fe3b5e8f0b43860d0b99ade205309
This commit is contained in:
Treehugger Robot
2021-10-29 19:56:26 +00:00
committed by Automerger Merge Worker

View File

@@ -137,9 +137,8 @@ func (lto *lto) LTO(ctx BaseModuleContext) bool {
func (lto *lto) DefaultThinLTO(ctx BaseModuleContext) bool { func (lto *lto) DefaultThinLTO(ctx BaseModuleContext) bool {
host := ctx.Host() host := ctx.Host()
test := ctx.testBinary()
vndk := ctx.isVndk() // b/169217596 vndk := ctx.isVndk() // b/169217596
return GlobalThinLTO(ctx) && !lto.Never() && !host && !test && !vndk return GlobalThinLTO(ctx) && !lto.Never() && !host && !vndk
} }
func (lto *lto) FullLTO() bool { func (lto *lto) FullLTO() bool {