diff options
| author | Roland Levillain <rpl@google.com> | 2020-06-15 18:50:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 18:50:24 +0000 |
| commit | f76e10aa2b61864489b8b947f0e5b57b049e9983 (patch) | |
| tree | ce7d139a89930dd0608b3e3b70fdf1caf66b5e54 /java/java.go | |
| parent | 5e8c0cf3ec110f78bfe69eea01b6049f286328d8 (diff) | |
| parent | d38ab21c6ecb08763e10f2bcba4ef4243bccc9df (diff) | |
Merge "Introduce product variables to select Java code coverage paths in Soong." am: d38ab21c6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326321
Change-Id: I1bf7f242f628c71eb5451057259868e76da4e66c
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 13f9f2fbf..ab8f859b6 100644 --- a/java/java.go +++ b/java/java.go @@ -601,7 +601,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 { |