Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1382ab6d authored by Oliver Nguyen's avatar Oliver Nguyen
Browse files

Add coverage flags for Clang coverage builds. 

Bug: 143977934
Test: m CLANG_COVERAGE=true
Test: m NATIVE_COVERAGE=true
Change-Id: I5d07d336e241856961eb0bc9678fdc9d5a076802
parent af7c2fcb

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -944,6 +944,10 @@ func (c *deviceConfig) NativeCoverageEnabled() bool { 
	return Bool(c.config.productVariables.NativeCoverage)

}



func (c *deviceConfig) ClangCoverageEnabled() bool {

	return Bool(c.config.productVariables.ClangCoverage)

}



func (c *deviceConfig) CoverageEnabledForPath(path string) bool {

	coverage := false

	if c.config.productVariables.CoveragePaths != nil {

android/variable.go

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ type productVariables struct { 
	TidyChecks *string `json:",omitempty"`



	NativeCoverage       *bool    `json:",omitempty"`

	ClangCoverage        *bool    `json:",omitempty"`

	CoveragePaths        []string `json:",omitempty"`

	CoverageExcludePaths []string `json:",omitempty"`

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizer 
}



func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool {

	return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled()

	return ctx.Device() && (ctx.DeviceConfig().NativeCoverageEnabled() || ctx.DeviceConfig().ClangCoverageEnabled())

}



func (a *apexBundle) PreventInstall() {

cc/coverage.go

+38 −12
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ func (cov *coverage) props() []interface{} { 
	return []interface{}{&cov.Properties}

}



func getProfileLibraryName(ctx ModuleContextIntf) string {

func getGcovProfileLibraryName(ctx ModuleContextIntf) string {

	// This function should only ever be called for a cc.Module, so the

	// following statement should always succeed.

	if ctx.useSdk() {
@@ -53,28 +53,47 @@ func getProfileLibraryName(ctx ModuleContextIntf) string { 
	}

}



func getClangProfileLibraryName(ctx ModuleContextIntf) string {

	if ctx.useSdk() {

		return "libprofile-clang-extras_ndk"

	} else {

		return "libprofile-clang-extras"

	}

}



func (cov *coverage) deps(ctx DepsContext, deps Deps) Deps {

	if cov.Properties.NeedCoverageVariant {

		ctx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},

		}, coverageDepTag, getProfileLibraryName(ctx))

		}, coverageDepTag, getGcovProfileLibraryName(ctx))

		ctx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},

		}, coverageDepTag, getClangProfileLibraryName(ctx))

	}

	return deps

}



func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags, PathDeps) {

	if !ctx.DeviceConfig().NativeCoverageEnabled() {

	gcovCoverage := ctx.DeviceConfig().NativeCoverageEnabled()

	clangCoverage := ctx.DeviceConfig().ClangCoverageEnabled()



	if !gcovCoverage && !clangCoverage {

		return flags, deps

	}



	if cov.Properties.CoverageEnabled {

		flags.Coverage = true

		flags.Local.CommonFlags = append(flags.Local.CommonFlags, "--coverage", "-O0")

		cov.linkCoverage = true



		if gcovCoverage {

			flags.Local.CommonFlags = append(flags.Local.CommonFlags, "--coverage", "-O0")



			// Override -Wframe-larger-than and non-default optimization

			// flags that the module may use.

			flags.Local.CFlags = append(flags.Local.CFlags, "-Wno-frame-larger-than=", "-O0")

		} else if clangCoverage {

			flags.Local.CommonFlags = append(flags.Local.CommonFlags, "-fprofile-instr-generate", "-fcoverage-mapping")

		}

	}



	// Even if we don't have coverage enabled, if any of our object files were compiled
@@ -112,12 +131,19 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags 
	}



	if cov.linkCoverage {

		if gcovCoverage {

			flags.Local.LdFlags = append(flags.Local.LdFlags, "--coverage")



		coverage := ctx.GetDirectDepWithTag(getProfileLibraryName(ctx), coverageDepTag).(*Module)

			coverage := ctx.GetDirectDepWithTag(getGcovProfileLibraryName(ctx), coverageDepTag).(*Module)

			deps.WholeStaticLibs = append(deps.WholeStaticLibs, coverage.OutputFile().Path())



			flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,--wrap,getenv")

		} else if clangCoverage {

			flags.Local.LdFlags = append(flags.Local.LdFlags, "-fprofile-instr-generate")



			coverage := ctx.GetDirectDepWithTag(getClangProfileLibraryName(ctx), coverageDepTag).(*Module)

			deps.WholeStaticLibs = append(deps.WholeStaticLibs, coverage.OutputFile().Path())

		}

	}



	return flags, deps
@@ -125,7 +151,7 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags 


func (cov *coverage) begin(ctx BaseModuleContext) {

	// Coverage is disabled globally

	if !ctx.DeviceConfig().NativeCoverageEnabled() {

	if !ctx.DeviceConfig().NativeCoverageEnabled() && !ctx.DeviceConfig().ClangCoverageEnabled() {

		return

	}