Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d690ee1 authored by Chris Wailes's avatar Chris Wailes Committed by Automerger Merge Worker
Browse files

Merge "Re-land "Make building Rust targets faster in eng builds"" into main... 

Merge "Re-land "Make building Rust targets faster in eng builds"" into main am: 431f004e am: 7a32a9f2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966051



Change-Id: I0231b53b90ff31345192a13234784953c50751d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 542093ed 7a32a9f2

rust/builder.go

+14 −15
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ func init() { 


func TransformSrcToBinary(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath) buildOutput {

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")



	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "bin")

}
@@ -134,20 +132,16 @@ func TransformSrctoRlib(ctx ModuleContext, mainSrc android.Path, deps PathDeps, 


func TransformSrctoDylib(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath) buildOutput {

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")



	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "dylib")

}



func TransformSrctoStatic(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath) buildOutput {

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "staticlib")

}



func TransformSrctoShared(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath) buildOutput {

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "cdylib")

}
@@ -263,6 +257,20 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 


	inputs = append(inputs, main)



	if ctx.Config().Eng() {

		// Per https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units

		// incremental building implies codegen-units=256

		incrementalPath := android.PathForModuleOut(ctx, "rustc-incremental").String()

		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C incremental="+incrementalPath)



	} else {

		flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C codegen-units=1")



		if !(ctx.RustModule().Rlib() || ctx.RustModule().ProcMacro()) {

			flags.GlobalRustFlags = append(flags.GlobalRustFlags, "-C lto=thin")

		}

	}



	// Collect rustc flags

	rustcFlags = append(rustcFlags, flags.GlobalRustFlags...)

	rustcFlags = append(rustcFlags, flags.RustFlags...)
@@ -278,15 +286,6 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
	// Suppress an implicit sysroot

	rustcFlags = append(rustcFlags, "--sysroot=/dev/null")



	// Enable incremental compilation if requested by user

	if ctx.Config().IsEnvTrue("SOONG_RUSTC_INCREMENTAL") {

		incrementalPath := android.PathForOutput(ctx, "rustc").String()



		rustcFlags = append(rustcFlags, "-C incremental="+incrementalPath)

	} else {

		rustcFlags = append(rustcFlags, "-C codegen-units=1")

	}



	// Disallow experimental features

	modulePath := ctx.ModuleDir()

	if !(android.IsThirdPartyPath(modulePath) || strings.HasPrefix(modulePath, "prebuilts")) {