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

Commit 72fd3d4e authored Oct 13, 2023 by Chris Wailes Committed by Automerger Merge Worker Oct 13, 2023

Merge "Set incremental or codegen-units, not both" into main am: ed75eef9

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

Change-Id: I74bd240aa9c0e0ba0d44c1c4ccfa0ba51e675f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 88640371 ed75eef9

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",