diff options
| author | 2023-11-22 20:37:27 +0000 | |
|---|---|---|
| committer | 2023-11-22 20:37:27 +0000 | |
| commit | b103659c0b9e883401d482168731d194b2c6657c (patch) | |
| tree | 9561013968ca2af25b30e9bf8dd1e4de5416912d /rust/proc_macro.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/proc_macro.go')
| -rw-r--r-- | rust/proc_macro.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rust/proc_macro.go b/rust/proc_macro.go index b93b24f15..c18d5ec70 100644 --- a/rust/proc_macro.go +++ b/rust/proc_macro.go @@ -78,8 +78,7 @@ func (procMacro *procMacroDecorator) compilerFlags(ctx ModuleContext, flags Flag func (procMacro *procMacroDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) buildOutput { fileName := procMacro.getStem(ctx) + ctx.toolchain().ProcMacroSuffix() outputFile := android.PathForModuleOut(ctx, fileName) - - srcPath, _ := srcPathFromModuleSrcs(ctx, procMacro.baseCompiler.Properties.Srcs) + srcPath := crateRootPath(ctx, procMacro) ret := TransformSrctoProcMacro(ctx, srcPath, deps, flags, outputFile) procMacro.baseCompiler.unstrippedOutputFile = outputFile return ret |