StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 71c139dced

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1592232

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I222e0b0ee5fe1a4e0d19d4d8f0ead8b937ddd052
This commit is contained in:
Martin Stjernholm
2021-02-18 08:44:37 +00:00
committed by Automerger Merge Worker
parent 9a9500d674 71c139dced
commit 2eed280a39
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/dexpreopt_config.go
View File

@@ -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"