StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use a default exclude filter for JaCoCo in Soong."

Browse Source
This commit is contained in:
Chris Gross
2020-06-26 14:59:15 +00:00
committed by Gerrit Code Review
parent 3d88ad68be 2f748692dd
commit 8f3386e49b
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/config.go
View File

@@ -1052,7 +1052,7 @@ func (c *deviceConfig) SamplingPGO() bool {
// represents any path. // represents any path.
func (c *deviceConfig) JavaCoverageEnabledForPath(path string) bool { func (c *deviceConfig) JavaCoverageEnabledForPath(path string) bool {
coverage := false coverage := false
if c.config.productVariables.JavaCoveragePaths == nil || if len(c.config.productVariables.JavaCoveragePaths) == 0 ||
InList("*", c.config.productVariables.JavaCoveragePaths) || InList("*", c.config.productVariables.JavaCoveragePaths) ||
HasAnyPrefix(path, c.config.productVariables.JavaCoveragePaths) { HasAnyPrefix(path, c.config.productVariables.JavaCoveragePaths) {
coverage = true coverage = true

3
java/config/config.go
View File

@@ -35,7 +35,8 @@ var (
DefaultLambdaStubsLibrary = "core-lambda-stubs" DefaultLambdaStubsLibrary = "core-lambda-stubs"
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"
DefaultJacocoExcludeFilter = []string{"org.junit.*", "org.jacoco.*", "org.mockito.*"} DefaultMakeJacocoExcludeFilter = []string{"org.junit.*", "org.jacoco.*", "org.mockito.*"}
DefaultJacocoExcludeFilter = []string{"org.junit.**", "org.jacoco.**", "org.mockito.**"}
InstrumentFrameworkModules = []string{ InstrumentFrameworkModules = []string{
"framework", "framework",

2
java/config/makevars.go
View File

@@ -64,7 +64,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("ZIPSYNC", "${ZipSyncCmd}") ctx.Strict("ZIPSYNC", "${ZipSyncCmd}")
ctx.Strict("JACOCO_CLI_JAR", "${JacocoCLIJar}") ctx.Strict("JACOCO_CLI_JAR", "${JacocoCLIJar}")
ctx.Strict("DEFAULT_JACOCO_EXCLUDE_FILTER", strings.Join(DefaultJacocoExcludeFilter, ",")) ctx.Strict("DEFAULT_JACOCO_EXCLUDE_FILTER", strings.Join(DefaultMakeJacocoExcludeFilter, ","))
ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}") ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}")

4
java/jacoco.go
View File

@@ -25,6 +25,7 @@ import (
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
"android/soong/java/config"
) )
var ( var (
@@ -76,7 +77,8 @@ func (j *Module) jacocoModuleToZipCommand(ctx android.ModuleContext) string {
if err != nil { if err != nil {
ctx.PropertyErrorf("jacoco.include_filter", "%s", err.Error()) ctx.PropertyErrorf("jacoco.include_filter", "%s", err.Error())
} }
excludes, err := jacocoFiltersToSpecs(j.properties.Jacoco.Exclude_filter) // Also include the default list of classes to exclude from instrumentation.
excludes, err := jacocoFiltersToSpecs(append(j.properties.Jacoco.Exclude_filter, config.DefaultJacocoExcludeFilter...))
if err != nil { if err != nil {
ctx.PropertyErrorf("jacoco.exclude_filter", "%s", err.Error()) ctx.PropertyErrorf("jacoco.exclude_filter", "%s", err.Error())
} }