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

Revert "Make ConfiguredJarList immutable"

Browse Source 
This reverts commit 052f4727fe.

Reason for revert: Looks to have broken master b/171756871

Change-Id: I6b3b7039c3e3b8ac453734281cb8e7c71b65aed3
This commit is contained in:
Joanne Chung
2020-10-27 03:22:29 +00:00
parent 052f4727fe
commit 1f25794e03
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/dexpreopt_config.go
View File

@@ -81,12 +81,13 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
targets := dexpreoptTargets(ctx)
deviceDir := android.PathForOutput(ctx, ctx.Config().DeviceName())
artModules := global.ArtApexJars
artModules := global.ArtApexJars.CopyOf()
// 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")
artModules.Append("com.android.art", "jacocoagent")
}
frameworkModules := global.BootJars.RemoveList(artModules)
frameworkModules := global.BootJars.CopyOf()
frameworkModules.RemoveList(artModules)
artSubdir := "apex/art_boot_images/javalib"
frameworkSubdir := "system/framework"