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

Commit 5f6e2ade authored by Chris Wailes's avatar Chris Wailes Committed by Gerrit Code Review
Browse files

Merge "Disallow the use of new unstable features"

parents 29b20ea4 6d12db42

rust/builder.go

+7 −1
Original line number Diff line number Diff line
@@ -250,6 +250,12 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		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

	linkFlags = append(linkFlags, flags.GlobalLinkFlags...)

	linkFlags = append(linkFlags, flags.LinkFlags...)