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

Merge "Disallow the use of new unstable features" am: 5f6e2ade1f am: 7250b0f484

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

Change-Id: I9af442d8dddae612a8304c40c8bda8cfc565a095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Wailes
2023-02-27 21:33:21 +00:00
committed by Automerger Merge Worker
parent 0a2ac88919 7250b0f484
commit 91ad4c17ca
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rust/builder.go
View File

@@ -247,7 +247,13 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl
if ctx.Config().IsEnvTrue("SOONG_RUSTC_INCREMENTAL") {
incrementalPath := android.PathForOutput(ctx, "rustc").String()
rustcFlags = append(rustcFlags, "-C incremental="+incrementalPath)
rustcFlags = append(rustcFlags, "-Cincremental="+incrementalPath)
}
// Disallow experimental features
modulePath := android.PathForModuleSrc(ctx).String()
if !(android.IsThirdPartyPath(modulePath) || strings.HasPrefix(modulePath, "prebuilts")) {
rustcFlags = append(rustcFlags, "-Zallow-features=\"default_alloc_error_handler,custom_inner_attributes,mixed_integer_ops,slice_internals\"")
}
// Collect linker flags