StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only link the profile extras lib for device variant for rust." into main

Browse Source
This commit is contained in:
Yu Liu
2024-04-25 22:45:57 +00:00
committed by Gerrit Code Review
parent 21ed4694c5 f0cf1cce98
commit 24cd8c3756
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rust/coverage.go
View File

@@ -39,9 +39,11 @@ func (cov *coverage) props() []interface{} {
func (cov *coverage) deps(ctx DepsContext, deps Deps) Deps { func (cov *coverage) deps(ctx DepsContext, deps Deps) Deps {
if cov.Properties.NeedCoverageVariant { if cov.Properties.NeedCoverageVariant {
ctx.AddVariationDependencies([]blueprint.Variation{ if ctx.Device() {
{Mutator: "link", Variation: "static"}, ctx.AddVariationDependencies([]blueprint.Variation{
}, cc.CoverageDepTag, CovLibraryName) {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. // 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() { if rustModule, ok := ctx.Module().(*Module); ok && rustModule.compiler.noStdlibs() {
@@ -60,12 +62,14 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags
if cov.Properties.CoverageEnabled { if cov.Properties.CoverageEnabled {
flags.Coverage = true flags.Coverage = true
coverage := ctx.GetDirectDepWithTag(CovLibraryName, cc.CoverageDepTag).(cc.LinkableInterface)
flags.RustFlags = append(flags.RustFlags, flags.RustFlags = append(flags.RustFlags,
"-C instrument-coverage", "-g") "-C instrument-coverage", "-g")
flags.LinkFlags = append(flags.LinkFlags, if ctx.Device() {
profileInstrFlag, "-g", coverage.OutputFile().Path().String(), "-Wl,--wrap,open") coverage := ctx.GetDirectDepWithTag(CovLibraryName, cc.CoverageDepTag).(cc.LinkableInterface)
deps.StaticLibs = append(deps.StaticLibs, coverage.OutputFile().Path()) 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. // 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() { if rustModule, ok := ctx.Module().(*Module); ok && rustModule.compiler.noStdlibs() {