diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 21:06:21 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 21:06:21 -0600 |
| commit | 418b5a60d6f98e2fc34a217251a6b04dbe8fb3ab (patch) | |
| tree | 3a4e9942c65c7925803598f4665a5c681afa6367 /cc/library.go | |
| parent | 4dac9eee3f43e0fa62015d6f7a318ec05f63bc63 (diff) | |
| parent | a4f4c0d08088a3bd8d00257e058d1bdfc093b1f8 (diff) | |
| download | android_build_soong-lineage-17.1.tar.gz android_build_soong-lineage-17.1.tar.bz2 android_build_soong-lineage-17.1.zip | |
Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37HEADlineage-17.1
Android 10.0.0 Release 37 (QQ3A.200605.001)
* tag 'android-10.0.0_r37':
Wrap getenv when linking a coverage-enabled binary
Refactor libprofile-extras to be added as a whole static library
Package coverage files as a zip.
Build native coverage variant of APEXes when needed
Change-Id: I89b49b7f720021e528ad51ef2be9554e06189904
Diffstat (limited to 'cc/library.go')
| -rw-r--r-- | cc/library.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cc/library.go b/cc/library.go index d8eb5b4e..39f7a724 100644 --- a/cc/library.go +++ b/cc/library.go @@ -629,7 +629,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, TransformObjToStaticLib(ctx, library.objects.objFiles, builderFlags, outputFile, objs.tidyFiles) - library.coverageOutputFile = TransformCoverageFilesToLib(ctx, library.objects, builderFlags, + library.coverageOutputFile = TransformCoverageFilesToZip(ctx, library.objects, ctx.ModuleName()+library.MutatedProperties.VariantName) library.wholeStaticMissingDeps = ctx.GetMissingDependencies() @@ -741,7 +741,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, objs.sAbiDumpFiles = append(objs.sAbiDumpFiles, deps.StaticLibObjs.sAbiDumpFiles...) objs.sAbiDumpFiles = append(objs.sAbiDumpFiles, deps.WholeStaticLibObjs.sAbiDumpFiles...) - library.coverageOutputFile = TransformCoverageFilesToLib(ctx, objs, builderFlags, library.getLibName(ctx)) + library.coverageOutputFile = TransformCoverageFilesToZip(ctx, objs, library.getLibName(ctx)) library.linkSAbiDumpFiles(ctx, objs, fileName, ret) return ret @@ -758,6 +758,10 @@ func (library *libraryDecorator) nativeCoverage() bool { return true } +func (library *libraryDecorator) coverageOutputFilePath() android.OptionalPath { + return library.coverageOutputFile +} + func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path { isLlndk := inList(ctx.baseModuleName(), llndkLibraries) || inList(ctx.baseModuleName(), ndkMigratedLibs) |