diff options
| author | 2020-10-23 18:26:03 +0100 | |
|---|---|---|
| committer | 2020-10-26 15:57:11 +0000 | |
| commit | 052f4727fea8fa279d36e6b25e74b325b7de7e19 (patch) | |
| tree | 57febe35a8ec91250b22712d7550770ff046b062 /java/dexpreopt_config.go | |
| parent | 1e8c6072bb2887d714a666e947ccd6eaa2e20611 (diff) | |
Make ConfiguredJarList immutable
By making the Append and RemoveList methods return a new list instead
of modifying the existing list it makes the ConfiguredJarList usages
easier to reason about and safer to use, especially considering that
they are primarily used in global configuration.
Bug: 171479578
Test: m nothing
Change-Id: I102c4fb42f0c54e4ed299d2921fbf5efeb6e99b9
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 0f8888a7d..c315124c9 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -81,13 +81,12 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { targets := dexpreoptTargets(ctx) deviceDir := android.PathForOutput(ctx, ctx.Config().DeviceName()) - artModules := global.ArtApexJars.CopyOf() + artModules := global.ArtApexJars // With EMMA_INSTRUMENT_FRAMEWORK=true the Core libraries depend on jacoco. if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") { - artModules.Append("com.android.art", "jacocoagent") + artModules = artModules.Append("com.android.art", "jacocoagent") } - frameworkModules := global.BootJars.CopyOf() - frameworkModules.RemoveList(artModules) + frameworkModules := global.BootJars.RemoveList(artModules) artSubdir := "apex/art_boot_images/javalib" frameworkSubdir := "system/framework" |