From ce48f5f396e37516e8f29680f4b5c7071375f2fc Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Wed, 29 Jan 2025 15:18:17 -0800 Subject: Do not perform LTO for Rust binaries during eng builds Test: TH Bug: 289094772 Change-Id: I4221a398a2afd3c83298ee9935634b7a6189f487 --- rust/builder.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'rust/builder.go') diff --git a/rust/builder.go b/rust/builder.go index 8a869aad8..e71cea058 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -159,10 +159,6 @@ 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")) } @@ -209,7 +205,10 @@ func TransformRlibstoStaticlib(ctx android.ModuleContext, mainSrc android.Path, 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 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