Merge "Global ThinLTO: opt out vndk binaries as a workaround"

1 files changed, 2 insertions, 1 deletions

diff --git a/cc/lto.go b/cc/lto.go
index abd8dfb9f..a3b28d9a2 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -71,7 +71,8 @@ func (lto *lto) begin(ctx BaseModuleContext) {
 	} else if ctx.Config().IsEnvTrue("GLOBAL_THINLTO") {
 		staticLib := ctx.static() && !ctx.staticBinary()
 		hostBin := ctx.Host()
-		if !staticLib && !hostBin {
+		vndk := ctx.isVndk() // b/169217596
+		if !staticLib && !hostBin && !vndk {
 			if !lto.Never() && !lto.FullLTO() {
 				lto.Properties.Lto.Thin = boolPtr(true)
 			}