From 3983413f13bc0c1a4d410425ca63e693cdc78bd9 Mon Sep 17 00:00:00 2001 From: Satish Yalla Date: Thu, 30 Jan 2025 20:59:55 -0800 Subject: 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 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'rust/builder.go') diff --git a/rust/builder.go b/rust/builder.go index e71cea058..8a869aad8 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -159,6 +159,10 @@ func getTransformProperties(ctx ModuleContext, crateType string) transformProper 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 @@ func TransformRlibstoStaticlib(ctx android.ModuleContext, mainSrc android.Path, 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 TransformRlibstoStaticlib(ctx android.ModuleContext, mainSrc android.Path, 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")) } -- cgit v1.2.3-59-g8ed1b