diff options
| author | Roland Levillain <rpl@google.com> | 2020-06-15 19:07:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 19:07:06 +0000 |
| commit | 23db998b8a423594befdfa4a882d94079fe04ffc (patch) | |
| tree | 61ace07c599c5cabe95ef0e21d5f9ba5f882225b /java/java.go | |
| parent | 0878af7585b0486ad198d2fa15622371a9951276 (diff) | |
| parent | f76e10aa2b61864489b8b947f0e5b57b049e9983 (diff) | |
Merge "Introduce product variables to select Java code coverage paths in Soong." am: d38ab21c6e am: f76e10aa2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326321
Change-Id: I3f66962252aac710d66f3f26908a7b5f530fa712
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 83573e55b..77da628bc 100644 --- a/java/java.go +++ b/java/java.go @@ -605,7 +605,9 @@ type jniLib struct { } func (j *Module) shouldInstrument(ctx android.BaseModuleContext) bool { - return j.properties.Instrument && ctx.Config().IsEnvTrue("EMMA_INSTRUMENT") + return j.properties.Instrument && + ctx.Config().IsEnvTrue("EMMA_INSTRUMENT") && + ctx.DeviceConfig().JavaCoverageEnabledForPath(ctx.ModuleDir()) } func (j *Module) shouldInstrumentStatic(ctx android.BaseModuleContext) bool { |