diff options
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index 3bfef7693..6d7401021 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -20,16 +20,22 @@ import ( "android/soong/android" "android/soong/rust/config" + "github.com/google/blueprint/proptools" ) +func getEdition(compiler *baseCompiler) string { + return proptools.StringDefault(compiler.Properties.Edition, config.DefaultEdition) +} + +func getDenyWarnings(compiler *baseCompiler) bool { + return BoolDefault(compiler.Properties.Deny_warnings, config.DefaultDenyWarnings) +} + func NewBaseCompiler(dir, dir64 string) *baseCompiler { return &baseCompiler{ - Properties: BaseCompilerProperties{ - Edition: &config.DefaultEdition, - Deny_warnings: config.DefaultDenyWarnings, - }, - dir: dir, - dir64: dir64, + Properties: BaseCompilerProperties{}, + dir: dir, + dir64: dir64, } } @@ -94,7 +100,7 @@ type baseCompiler struct { dir64 string subDir string relative string - path android.OutputPath + path android.InstallPath } var _ compiler = (*baseCompiler)(nil) @@ -113,12 +119,12 @@ func (compiler *baseCompiler) featuresToFlags(features []string) []string { func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flags { - if Bool(compiler.Properties.Deny_warnings) { + if getDenyWarnings(compiler) { flags.RustFlags = append(flags.RustFlags, "-D warnings") } flags.RustFlags = append(flags.RustFlags, compiler.Properties.Flags...) flags.RustFlags = append(flags.RustFlags, compiler.featuresToFlags(compiler.Properties.Features)...) - flags.RustFlags = append(flags.RustFlags, "--edition="+*compiler.Properties.Edition) + flags.RustFlags = append(flags.RustFlags, "--edition="+getEdition(compiler)) flags.LinkFlags = append(flags.LinkFlags, compiler.Properties.Ld_flags...) flags.GlobalRustFlags = append(flags.GlobalRustFlags, config.GlobalRustFlags...) flags.GlobalRustFlags = append(flags.GlobalRustFlags, ctx.toolchain().ToolchainRustFlags()) @@ -173,7 +179,7 @@ func (compiler *baseCompiler) crateName() string { return compiler.Properties.Crate_name } -func (compiler *baseCompiler) installDir(ctx ModuleContext) android.OutputPath { +func (compiler *baseCompiler) installDir(ctx ModuleContext) android.InstallPath { dir := compiler.dir if ctx.toolchain().Is64Bit() && compiler.dir64 != "" { dir = compiler.dir64 |