Merge "Do not perform LTO for Rust binaries during eng builds" into main
diff --git a/rust/builder.go b/rust/builder.go
index 8a869aa..e71cea0 100644
--- a/rust/builder.go
+++ b/rust/builder.go
@@ -159,10 +159,6 @@
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"))
}
@@ -209,7 +205,10 @@
rustFlags = CommonDefaultFlags(ctx, toolchain, rustFlags)
rustFlags = CommonLibraryCompilerFlags(ctx, rustFlags)
- rustFlags.GlobalRustFlags = append(rustFlags.GlobalRustFlags, "-C lto=thin")
+
+ if !ctx.Config().Eng() {
+ rustFlags.GlobalRustFlags = append(rustFlags.GlobalRustFlags, "-C lto=thin")
+ }
rustFlags.EmitXrefs = false
@@ -218,28 +217,16 @@
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"))
}
diff --git a/rust/compiler.go b/rust/compiler.go
index f186ef3..62e53bf 100644
--- a/rust/compiler.go
+++ b/rust/compiler.go
@@ -477,6 +477,11 @@
}
}
+ // 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())