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

Commit 0452678a authored by Oliver Nguyen's avatar Oliver Nguyen
Browse files

Only package gcno files for gcov coverage builds. 

Bug: 154550223
Test: m -j NATIVE_COVERAGE=true droid dist tests
Test: m -j CLANG_COVERAGE=true droid dist tests
Merged-In: I81598bcab8db105de6692156c001fc961409ce63
Change-Id: I81598bcab8db105de6692156c001fc961409ce63
parent 38368355

cc/builder.go

+3 −3
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ type builderFlags struct { 
	rsFlags       string

	toolchain     config.Toolchain

	tidy          bool

	coverage      bool

	gcovCoverage  bool

	sAbiDump      bool

	emitXrefs     bool
@@ -369,7 +369,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and 
		tidyFiles = make(android.Paths, 0, len(srcFiles))

	}

	var coverageFiles android.Paths

	if flags.coverage {

	if flags.gcovCoverage {

		coverageFiles = make(android.Paths, 0, len(srcFiles))

	}

	var kytheFiles android.Paths
@@ -470,7 +470,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and 


		var ccCmd string

		tidy := flags.tidy

		coverage := flags.coverage

		coverage := flags.gcovCoverage

		dump := flags.sAbiDump

		rule := cc

		emitXref := flags.emitXrefs

cc/cc.go

+5 −5
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ type Flags struct { 


	Toolchain    config.Toolchain

	Tidy         bool

	Coverage  bool

	GcovCoverage bool

	SAbiDump     bool

	EmitXrefs    bool // If true, generate Ninja rules to generate emitXrefs input files for Kythe

cc/coverage.go

+1 −1
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags 
	}



	if cov.Properties.CoverageEnabled {

		flags.Coverage = true

		cov.linkCoverage = true



		if gcovCoverage {

			flags.GcovCoverage = true

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



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

cc/util.go

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ func flagsToBuilderFlags(in Flags) builderFlags { 
		tidyFlags:     strings.Join(in.TidyFlags, " "),

		sAbiFlags:     strings.Join(in.SAbiFlags, " "),

		toolchain:     in.Toolchain,

		coverage:      in.Coverage,

		gcovCoverage:  in.GcovCoverage,

		tidy:          in.Tidy,

		sAbiDump:      in.SAbiDump,

		emitXrefs:     in.EmitXrefs,