From 0a9dae6e9a8133c898c82a883100f58a0f798fc7 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 17 Feb 2021 12:30:46 +0000 Subject: [PATCH] Move the logic to add jacocoagent in instrumentation builds to make. Test: m nothing Test: m nothing EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true Bug: 180325915 Change-Id: Ieec8c8a122ff930e14cef4b5a0a2f9fc9e3b70ad --- java/dexpreopt_config.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index c315124c9..282e9364e 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -82,10 +82,6 @@ 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 = artModules.Append("com.android.art", "jacocoagent") - } frameworkModules := global.BootJars.RemoveList(artModules) artSubdir := "apex/art_boot_images/javalib"