diff options
| author | 2020-01-08 10:58:24 +0000 | |
|---|---|---|
| committer | 2020-01-08 10:58:24 +0000 | |
| commit | 11e1ae025f45e47d53f52a839ed659bc8f877fb8 (patch) | |
| tree | 3b522f0744bab56fd1ae86d4171057b70484727e /java/dexpreopt_config.go | |
| parent | 46f60291f34c69bd941c13d793bd59369ef7f292 (diff) | |
| parent | 4456188939ebadae8e38cc15c8f99bbbf1c989f8 (diff) | |
Merge "Include jacoco in the ART boot image if EMMA_INSTRUMENT_FRAMEWORK=true."
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index b3af911fb..35748b8d1 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -136,6 +136,10 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { deviceDir := android.PathForOutput(ctx, ctx.Config().DeviceName()) artModules := global.ArtApexJars + // With EMMA_INSTRUMENT_FRAMEWORK=true the Core libraries depend on jacoco. + if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") { + artModules = append(artModules, "jacocoagent") + } frameworkModules := android.RemoveListFromList(global.BootJars, concat(artModules, getJarsFromApexJarPairs(global.UpdatableBootJars))) |