diff options
author | 2020-04-09 09:56:02 -0400 | |
---|---|---|
committer | 2020-05-05 10:30:15 -0400 | |
commit | a0cd8f9acb8c5c04c1082cc980cc8cca28aff5a9 (patch) | |
tree | f69f7651add1ce0e4089711fa207b4741815c589 /rust/library.go | |
parent | b8bb5d05ce523b0dc88085313f6514910954db41 (diff) |
Add gcov coverage support to Rust modules.
This adds gcov coverage support for Rust device library and binary
modules (including test modules). Support is provided to pass Rust
static library gcno files to CC modules and visa versa.
Additional changes:
* Begin mutator added for Rust modules.
* SuffixInList added to android package.
* CoverageEnabled added to Coverage interface.
* CoverageFiles added to LinkableLibrary interface.
* Fix in coverage mutator for non-CC modules which marked the wrong
variant as the coverage variant.
* Added coverage libraries to the cc.GatherRequiredDepsForTest.
Bug: 146448203
Test: NATIVE_COVERAGE=true COVERAGE_PATHS='*' m -j <rust_module>
Change-Id: If20728bdde42a1dd544a35a40f0d981b80a5835f
Diffstat (limited to 'rust/library.go')
-rw-r--r-- | rust/library.go | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/rust/library.go b/rust/library.go index 87e816dba..8aa033c0f 100644 --- a/rust/library.go +++ b/rust/library.go @@ -75,11 +75,12 @@ type LibraryMutatedProperties struct { type libraryDecorator struct { *baseCompiler - Properties LibraryCompilerProperties - MutatedProperties LibraryMutatedProperties - distFile android.OptionalPath - unstrippedOutputFile android.Path - includeDirs android.Paths + Properties LibraryCompilerProperties + MutatedProperties LibraryMutatedProperties + distFile android.OptionalPath + coverageOutputZipFile android.OptionalPath + unstrippedOutputFile android.Path + includeDirs android.Paths } type libraryInterface interface { @@ -107,6 +108,10 @@ type libraryInterface interface { BuildOnlyShared() } +func (library *libraryDecorator) nativeCoverage() bool { + return true +} + func (library *libraryDecorator) exportedDirs() []string { return library.linkDirs } @@ -351,23 +356,36 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa fileName := library.getStem(ctx) + ctx.toolchain().RlibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - TransformSrctoRlib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + outputs := TransformSrctoRlib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + library.coverageFile = outputs.coverageFile } else if library.dylib() { fileName := library.getStem(ctx) + ctx.toolchain().DylibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - TransformSrctoDylib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + outputs := TransformSrctoDylib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + library.coverageFile = outputs.coverageFile } else if library.static() { fileName := library.getStem(ctx) + ctx.toolchain().StaticLibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - TransformSrctoStatic(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + outputs := TransformSrctoStatic(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + library.coverageFile = outputs.coverageFile } else if library.shared() { fileName := library.getStem(ctx) + ctx.toolchain().SharedLibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - TransformSrctoShared(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + outputs := TransformSrctoShared(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) + library.coverageFile = outputs.coverageFile + } + + var coverageFiles android.Paths + if library.coverageFile != nil { + coverageFiles = append(coverageFiles, library.coverageFile) + } + if len(deps.coverageFiles) > 0 { + coverageFiles = append(coverageFiles, deps.coverageFiles...) } + library.coverageOutputZipFile = TransformCoverageFilesToZip(ctx, coverageFiles, library.getStem(ctx)) if library.rlib() || library.dylib() { library.reexportDirs(deps.linkDirs...) |