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

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

Change-Id: I477da4afd355066147de2a1a6d962a1283b72ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Wailes
2023-02-27 20:56:50 +00:00
committed by Automerger Merge Worker
parent deac31ef48 5f6e2ade1f
commit 7250b0f484
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/builder.go
View File

@@ -250,6 +250,12 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl
rustcFlags = append(rustcFlags, "-Cincremental="+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 // Collect linker flags
linkFlags = append(linkFlags, flags.GlobalLinkFlags...) linkFlags = append(linkFlags, flags.GlobalLinkFlags...)
linkFlags = append(linkFlags, flags.LinkFlags...) linkFlags = append(linkFlags, flags.LinkFlags...)