diff options
Diffstat (limited to 'rust/builder.go')
| -rw-r--r-- | rust/builder.go | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/rust/builder.go b/rust/builder.go index fe2d03a0b..162d1aab0 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -238,6 +238,10 @@ func rustEnvVars(ctx ModuleContext, deps PathDeps) []string { } } + if ctx.Darwin() { + envVars = append(envVars, "ANDROID_RUST_DARWIN=true") + } + return envVars } @@ -284,7 +288,7 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl } // Disallow experimental features - modulePath := android.PathForModuleSrc(ctx).String() + modulePath := ctx.ModuleDir() if !(android.IsThirdPartyPath(modulePath) || strings.HasPrefix(modulePath, "prebuilts")) { rustcFlags = append(rustcFlags, "-Zallow-features=\"\"") } @@ -346,19 +350,6 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl implicits = append(implicits, outputs.Paths()...) } - envVars = append(envVars, "ANDROID_RUST_VERSION="+config.GetRustVersion(ctx)) - - if ctx.RustModule().compiler.CargoEnvCompat() { - if _, ok := ctx.RustModule().compiler.(*binaryDecorator); ok { - envVars = append(envVars, "CARGO_BIN_NAME="+strings.TrimSuffix(outputFile.Base(), outputFile.Ext())) - } - envVars = append(envVars, "CARGO_CRATE_NAME="+ctx.RustModule().CrateName()) - pkgVersion := ctx.RustModule().compiler.CargoPkgVersion() - if pkgVersion != "" { - envVars = append(envVars, "CARGO_PKG_VERSION="+pkgVersion) - } - } - if flags.Clippy { clippyFile := android.PathForModuleOut(ctx, outputFile.Base()+".clippy") ctx.Build(pctx, android.BuildParams{ @@ -445,7 +436,7 @@ func Rustdoc(ctx ModuleContext, main android.Path, deps PathDeps, docTimestampFile := android.PathForModuleOut(ctx, "rustdoc.timestamp") // Silence warnings about renamed lints for third-party crates - modulePath := android.PathForModuleSrc(ctx).String() + modulePath := ctx.ModuleDir() if android.IsThirdPartyPath(modulePath) { rustdocFlags = append(rustdocFlags, " -A warnings") } |