StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Chris Wailes
2023-10-13 21:59:30 +00:00
committed by Automerger Merge Worker
parent 886403712f ed75eef953
commit 72fd3d4e86
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/builder.go
View File

@@ -279,6 +279,8 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl
incrementalPath := android.PathForOutput(ctx, "rustc").String() incrementalPath := android.PathForOutput(ctx, "rustc").String()
rustcFlags = append(rustcFlags, "-C incremental="+incrementalPath) rustcFlags = append(rustcFlags, "-C incremental="+incrementalPath)
} else {
rustcFlags = append(rustcFlags, "-C codegen-units=1")
} }
// Disallow experimental features // Disallow experimental features

1
rust/config/global.go
View File

@@ -44,7 +44,6 @@ var (
GlobalRustFlags = []string{ GlobalRustFlags = []string{
"-Z stack-protector=strong", "-Z stack-protector=strong",
"-Z remap-cwd-prefix=.", "-Z remap-cwd-prefix=.",
"-C codegen-units=1",
"-C debuginfo=2", "-C debuginfo=2",
"-C opt-level=3", "-C opt-level=3",
"-C relocation-model=pic", "-C relocation-model=pic",