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

Commit 7c1b29c9 authored by Chris Wailes's avatar Chris Wailes
Browse files

Set incremental or codegen-units, not both 

This CL changes the handling of Rust flags to only pass one of either
incremental or codegen-units.  This is necessary because incremental
implies a codegen-units value of 128 and it may be overridden by the
separate codegen-units argument.

Test: TH
Change-Id: Ia474e4f9fc071d5054cb479ec9de550fa886677e
parent d56338cc

rust/builder.go

+3 −1
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		incrementalPath := android.PathForOutput(ctx, "rustc").String()



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

	} else {

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

	}



	// Disallow experimental features

rust/config/global.go

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ var ( 
	GlobalRustFlags = []string{

		"-Z stack-protector=strong",

		"-Z remap-cwd-prefix=.",

		"-C codegen-units=1",

		"-C debuginfo=2",

		"-C opt-level=3",

		"-C relocation-model=pic",