diff options
| author | 2023-11-22 20:37:27 +0000 | |
|---|---|---|
| committer | 2023-11-22 20:37:27 +0000 | |
| commit | b103659c0b9e883401d482168731d194b2c6657c (patch) | |
| tree | 9561013968ca2af25b30e9bf8dd1e4de5416912d /rust/binary.go | |
| parent | f7474880a152b8423231b70d597c8a949ae2ab01 (diff) | |
| parent | db72f7ed803df370951f7a03bd6f6fcad1b357e2 (diff) | |
Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main
* changes:
rust: Resolve crate roots outside rust-project
rust: Cache crateRootPath to avoid ctx
rust: internalize srcPathFromModuleSrcs
rust: move crateRootPath to compiler
rust: Privatize Cargo* methods on compiler
rust: Move compiler interface to compiler.go
Diffstat (limited to 'rust/binary.go')
| -rw-r--r-- | rust/binary.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/rust/binary.go b/rust/binary.go index 860dc948a..5e7e922cf 100644 --- a/rust/binary.go +++ b/rust/binary.go @@ -137,12 +137,7 @@ func (binary *binaryDecorator) compile(ctx ModuleContext, flags Flags, deps Path fileName := binary.getStem(ctx) + ctx.toolchain().ExecutableSuffix() outputFile := android.PathForModuleOut(ctx, fileName) ret := buildOutput{outputFile: outputFile} - var crateRootPath android.Path - if binary.baseCompiler.Properties.Crate_root == nil { - crateRootPath, _ = srcPathFromModuleSrcs(ctx, binary.baseCompiler.Properties.Srcs) - } else { - crateRootPath = android.PathForModuleSrc(ctx, *binary.baseCompiler.Properties.Crate_root) - } + crateRootPath := crateRootPath(ctx, binary) flags.RustFlags = append(flags.RustFlags, deps.depFlags...) flags.LinkFlags = append(flags.LinkFlags, deps.depLinkFlags...) |