diff options
author | 2020-06-24 20:36:59 +0000 | |
---|---|---|
committer | 2020-06-25 16:45:44 +0000 | |
commit | 2f748692dd0ebdd9677b44f43e8a49f042727db2 (patch) | |
tree | 29ad0bd842be18c6f032f5804a261a9a9a1fd985 /java/config/config.go | |
parent | 6f61fa75c676268851d2a1cf433f26c042a62939 (diff) |
Use a default exclude filter for JaCoCo in Soong.
Instrumented builds should exclude certain classes from instrumenation
by default. (e.g. JaCoCo itself) Leverage the existing
DefaultJacocoExclusionFilter to do this.
Note: Two different default filters exist now (one for Make and one for
Soong), as they have different wildcard rules.
Test: EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true m -j32
TeleService and inspected the resulting temporary jar that was
instrumented to confirm that anything from org/jacoco was excluded.
Bug: 159748844
Change-Id: I5466b0a03957edfbe53971d5d1a7729fdb8337db
Diffstat (limited to 'java/config/config.go')
-rw-r--r-- | java/config/config.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/config/config.go b/java/config/config.go index bb5be3aca..23b593a82 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -35,7 +35,8 @@ var ( DefaultLambdaStubsLibrary = "core-lambda-stubs" 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{ "framework", |