Revert "Make ConfiguredJarList immutable"
This reverts commit 052f4727fea8fa279d36e6b25e74b325b7de7e19.
Reason for revert: Looks to have broken master b/171756871
Change-Id: I6b3b7039c3e3b8ac453734281cb8e7c71b65aed3
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index c315124..0f8888a 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -81,12 +81,13 @@
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"