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/binary.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/binary.go')
| -rw-r--r-- | cc/binary.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cc/binary.go b/cc/binary.go index aa5b2794..2a6ceb82 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -388,7 +388,7 @@ func (binary *binaryDecorator) link(ctx ModuleContext, objs.coverageFiles = append(objs.coverageFiles, deps.StaticLibObjs.coverageFiles...) objs.coverageFiles = append(objs.coverageFiles, deps.WholeStaticLibObjs.coverageFiles...) - binary.coverageOutputFile = TransformCoverageFilesToLib(ctx, objs, builderFlags, binary.getStem(ctx)) + binary.coverageOutputFile = TransformCoverageFilesToZip(ctx, objs, binary.getStem(ctx)) // Need to determine symlinks early since some targets (ie APEX) need this // information but will not call 'install' @@ -421,6 +421,10 @@ func (binary *binaryDecorator) nativeCoverage() bool { return true } +func (binary *binaryDecorator) coverageOutputFilePath() android.OptionalPath { + return binary.coverageOutputFile +} + // /system/bin/linker -> /apex/com.android.runtime/bin/linker func (binary *binaryDecorator) installSymlinkToRuntimeApex(ctx ModuleContext, file android.Path) { dir := binary.baseInstaller.installDir(ctx) |