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

Commit e6e04663 authored by Roland Levillain's avatar Roland Levillain Committed by Automerger Merge Worker
Browse files

Rename native code coverage paths product variables in Soong. am: 0c9a2d07 am: 4a49ad6e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12036110

Change-Id: Ia0b98f641936cde64d4b55b704208c681e076d92
parents dee9ea31 4a49ad6e

android/config.go

+10 −5
Original line number Diff line number Diff line
@@ -1049,15 +1049,20 @@ func (c *deviceConfig) ClangCoverageEnabled() bool { 
	return Bool(c.config.productVariables.ClangCoverage)

}



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

// NativeCoverageEnabledForPath returns whether (GCOV- or Clang-based) native

// code coverage is enabled for path. By default, coverage is not enabled for a

// given path unless it is part of the NativeCoveragePaths product variable (and

// not part of the NativeCoverageExcludePaths product variable). Value "*" in

// NativeCoveragePaths represents any path.

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

	coverage := false

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

		if InList("*", c.config.productVariables.CoveragePaths) || HasAnyPrefix(path, c.config.productVariables.CoveragePaths) {

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

		if InList("*", c.config.productVariables.NativeCoveragePaths) || HasAnyPrefix(path, c.config.productVariables.NativeCoveragePaths) {

			coverage = true

		}

	}

	if coverage && c.config.productVariables.CoverageExcludePaths != nil {

		if HasAnyPrefix(path, c.config.productVariables.CoverageExcludePaths) {

	if coverage && c.config.productVariables.NativeCoverageExcludePaths != nil {

		if HasAnyPrefix(path, c.config.productVariables.NativeCoverageExcludePaths) {

			coverage = false

		}

	}

android/variable.go

+5 −5
Original line number Diff line number Diff line
@@ -256,8 +256,8 @@ type productVariables struct { 
	NativeLineCoverage         *bool    `json:",omitempty"`

	Native_coverage            *bool    `json:",omitempty"`

	ClangCoverage              *bool    `json:",omitempty"`

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

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

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

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



	DevicePrefer32BitApps        *bool `json:",omitempty"`

	DevicePrefer32BitExecutables *bool `json:",omitempty"`

cc/coverage.go

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ func (cov *coverage) begin(ctx BaseModuleContext) { 


		if needCoverageVariant {

			// Coverage variant is actually built with coverage if enabled for its module path

			needCoverageBuild = ctx.DeviceConfig().CoverageEnabledForPath(ctx.ModuleDir())

			needCoverageBuild = ctx.DeviceConfig().NativeCoverageEnabledForPath(ctx.ModuleDir())

		}

	}