diff options
| author | 2020-10-27 03:22:29 +0000 | |
|---|---|---|
| committer | 2020-10-27 03:22:29 +0000 | |
| commit | 1f25794e032cfe7f51e45345a824651a03b8f222 (patch) | |
| tree | 900e3677fa88b48f316192c3c412d03e2a4db70c /java/dexpreopt_config.go | |
| parent | 052f4727fea8fa279d36e6b25e74b325b7de7e19 (diff) | |
Revert "Make ConfiguredJarList immutable"
This reverts commit 052f4727fea8fa279d36e6b25e74b325b7de7e19.
Reason for revert: Looks to have broken master b/171756871
Change-Id: I6b3b7039c3e3b8ac453734281cb8e7c71b65aed3
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index c315124c9..0f8888a7d 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -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" |