diff options
| -rw-r--r-- | rust/compiler.go | 4 | ||||
| -rw-r--r-- | rust/coverage.go | 13 | ||||
| -rw-r--r-- | rust/rust.go | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index 8ec42f079..31acd49cb 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -208,6 +208,10 @@ func (compiler *baseCompiler) SetDisabled() { panic("baseCompiler does not implement SetDisabled()") } +func (compiler *baseCompiler) noStdlibs() bool { + return Bool(compiler.Properties.No_stdlibs) +} + func (compiler *baseCompiler) coverageOutputZipPath() android.OptionalPath { panic("baseCompiler does not implement coverageOutputZipPath()") } diff --git a/rust/coverage.go b/rust/coverage.go index 5ea481fcf..bc6504ddc 100644 --- a/rust/coverage.go +++ b/rust/coverage.go @@ -21,6 +21,7 @@ import ( ) var CovLibraryName = "libprofile-clang-extras" +var ProfilerBuiltins = "libprofiler_builtins.rust_sysroot" // Add '%c' to default specifier after we resolve http://b/210012154 const profileInstrFlag = "-fprofile-instr-generate=/data/misc/trace/clang-%p-%m.profraw" @@ -41,6 +42,11 @@ func (cov *coverage) deps(ctx DepsContext, deps Deps) Deps { ctx.AddVariationDependencies([]blueprint.Variation{ {Mutator: "link", Variation: "static"}, }, cc.CoverageDepTag, CovLibraryName) + + // no_std modules are missing libprofiler_builtins which provides coverage, so we need to add it as a dependency. + if rustModule, ok := ctx.Module().(*Module); ok && rustModule.compiler.noStdlibs() { + ctx.AddVariationDependencies([]blueprint.Variation{{Mutator: "rust_libraries", Variation: "rlib"}}, rlibDepTag, ProfilerBuiltins) + } } return deps @@ -60,6 +66,13 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags flags.LinkFlags = append(flags.LinkFlags, profileInstrFlag, "-g", coverage.OutputFile().Path().String(), "-Wl,--wrap,open") deps.StaticLibs = append(deps.StaticLibs, coverage.OutputFile().Path()) + + // no_std modules are missing libprofiler_builtins which provides coverage, so we need to add it as a dependency. + if rustModule, ok := ctx.Module().(*Module); ok && rustModule.compiler.noStdlibs() { + profiler_builtins := ctx.GetDirectDepWithTag(ProfilerBuiltins, rlibDepTag).(*Module) + deps.RLibs = append(deps.RLibs, RustLibrary{Path: profiler_builtins.OutputFile().Path(), CrateName: profiler_builtins.CrateName()}) + } + if cc.EnableContinuousCoverage(ctx) { flags.RustFlags = append(flags.RustFlags, "-C llvm-args=--runtime-counter-relocation") flags.LinkFlags = append(flags.LinkFlags, "-Wl,-mllvm,-runtime-counter-relocation") diff --git a/rust/rust.go b/rust/rust.go index 67e0d7c03..e4cf67129 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -490,6 +490,7 @@ type compiler interface { SetDisabled() stdLinkage(ctx *depsContext) RustLinkage + noStdlibs() bool unstrippedOutputFilePath() android.Path strippedOutputFilePath() android.OptionalPath |