diff options
| author | 2021-01-14 16:03:18 -0800 | |
|---|---|---|
| committer | 2021-01-15 19:44:07 +0000 | |
| commit | fa049385b89273f8c0ab3cd76e5ff3724265ec6c (patch) | |
| tree | 0d5449d0fbef8dc3679b588d5609b0c1986dc92b /rust/library.go | |
| parent | 66f7fdd1c89ad5d0eab631143902f6ee17de6332 (diff) | |
Migrate Rust to LLVM coverage.
Bug: 177675913
Test: Manually compile, run, and see output with llvm-cov.
Change-Id: I66729cff87a848782e9fa1b95cbbc06318c5761a
Diffstat (limited to 'rust/library.go')
| -rw-r--r-- | rust/library.go | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/rust/library.go b/rust/library.go index 4ac52b428..643328564 100644 --- a/rust/library.go +++ b/rust/library.go @@ -452,26 +452,22 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa fileName = library.getStem(ctx) + ctx.toolchain().RlibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - outputs := TransformSrctoRlib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) - library.coverageFile = outputs.coverageFile + TransformSrctoRlib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) } else if library.dylib() { fileName = library.getStem(ctx) + ctx.toolchain().DylibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - outputs := TransformSrctoDylib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) - library.coverageFile = outputs.coverageFile + TransformSrctoDylib(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) } else if library.static() { fileName = library.getStem(ctx) + ctx.toolchain().StaticLibSuffix() outputFile = android.PathForModuleOut(ctx, fileName) - outputs := TransformSrctoStatic(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) - library.coverageFile = outputs.coverageFile + TransformSrctoStatic(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) } else if library.shared() { fileName = library.sharedLibFilename(ctx) outputFile = android.PathForModuleOut(ctx, fileName) - outputs := TransformSrctoShared(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) - library.coverageFile = outputs.coverageFile + TransformSrctoShared(ctx, srcPath, deps, flags, outputFile, deps.linkDirs) } if !library.rlib() && library.stripper.NeedsStrip(ctx) { @@ -480,15 +476,6 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa library.strippedOutputFile = android.OptionalPathForPath(strippedOutputFile) } - 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.flagExporter.exportLinkDirs(deps.linkDirs...) library.flagExporter.exportDepFlags(deps.depFlags...) |