diff options
| author | 2020-01-08 10:58:24 +0000 | |
|---|---|---|
| committer | 2020-01-08 10:58:24 +0000 | |
| commit | 11e1ae025f45e47d53f52a839ed659bc8f877fb8 (patch) | |
| tree | 3b522f0744bab56fd1ae86d4171057b70484727e /apex/apex.go | |
| parent | 46f60291f34c69bd941c13d793bd59369ef7f292 (diff) | |
| parent | 4456188939ebadae8e38cc15c8f99bbbf1c989f8 (diff) | |
Merge "Include jacoco in the ART boot image if EMMA_INSTRUMENT_FRAMEWORK=true."
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 9867a7a81..eb9614284 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -699,6 +699,12 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), javaLibTag, a.properties.Java_libs...) + // With EMMA_INSTRUMENT_FRAMEWORK=true the ART boot image includes jacoco library. + if a.artApex && ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") { + ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), + javaLibTag, "jacocoagent") + } + if String(a.properties.Key) == "" { ctx.ModuleErrorf("key is missing") return |