commit 3983413f13bc0c1a4d410425ca63e693cdc78bd9
author Satish Yalla <satishy@google.com> Thu Jan 30 20:59:55 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 20:59:55 2025 -0800
tree 003a2512d4507811c6141125042d9124bfc51931
parent ce48f5f396e37516e8f29680f4b5c7071375f2fc

Revert "Do not perform LTO for Rust binaries during eng builds"

This reverts commit ce48f5f396e37516e8f29680f4b5c7071375f2fc.

Reason for revert: Droidmonitor created revert due to b/393452310. Will be verified through ABTD for standarrd investigation.

Change-Id: I6a4ce6bcb23a4c515aba1ef4eb9995d85a5fdda8

rust/builder.go

diff --git a/rust/builder.go b/rust/builder.go
index e71cea0..8a869aa 100644
--- a/rust/builder.go
+++ b/rust/builder.go
@@ -159,6 +159,10 @@
 
 func TransformSrcToBinary(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,
 	outputFile android.WritablePath) buildOutput {
+	if ctx.RustModule().compiler.Thinlto() {
+		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")
+	}
+
 	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, getTransformProperties(ctx, "bin"))
 }
 
@@ -205,10 +209,7 @@
 
 	rustFlags = CommonDefaultFlags(ctx, toolchain, rustFlags)
 	rustFlags = CommonLibraryCompilerFlags(ctx, rustFlags)
-
-	if !ctx.Config().Eng() {
-		rustFlags.GlobalRustFlags = append(rustFlags.GlobalRustFlags, "-C lto=thin")
-	}
+	rustFlags.GlobalRustFlags = append(rustFlags.GlobalRustFlags, "-C lto=thin")
 
 	rustFlags.EmitXrefs = false
 
@@ -217,16 +218,28 @@
 
 func TransformSrctoDylib(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,
 	outputFile android.WritablePath) buildOutput {
+	if ctx.RustModule().compiler.Thinlto() {
+		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")
+	}
+
 	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, getTransformProperties(ctx, "dylib"))
 }
 
 func TransformSrctoStatic(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,
 	outputFile android.WritablePath) buildOutput {
+	if ctx.RustModule().compiler.Thinlto() {
+		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")
+	}
+
 	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, getTransformProperties(ctx, "staticlib"))
 }
 
 func TransformSrctoShared(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,
 	outputFile android.WritablePath) buildOutput {
+	if ctx.RustModule().compiler.Thinlto() {
+		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")
+	}
+
 	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, getTransformProperties(ctx, "cdylib"))
 }
 

rust/compiler.go

diff --git a/rust/compiler.go b/rust/compiler.go
index 8ea5769..1d2fb58 100644
--- a/rust/compiler.go
+++ b/rust/compiler.go
@@ -450,11 +450,6 @@
 		}
 	}
 
-	// Enable LTO for non-engineering builds if the module supports and requests it.
-	if !ctx.Config().Eng() && !(ctx.RustModule().Rlib() || ctx.RustModule().ProcMacro()) && ctx.RustModule().compiler.Thinlto() {
-		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")
-	}
-
 	flags.RustFlags = append(flags.RustFlags, lintFlags)
 	flags.RustFlags = append(flags.RustFlags, compiler.Properties.Flags...)
 	flags.RustFlags = append(flags.RustFlags, "--edition="+compiler.edition())