Remove unnecessary properties in GlobalJSONConfig
This change removes the properties in GlobalJSONConfig that are used to
hold the unmarshalled []string along with the code to convert them into
ConfiguredJarList as they are no longer necessary because the
ConfiguredJarList.UnmarshalJSON(..) method can handle that automatically.
Bug: 171479578
Test: m nothing
Change-Id: Ie297cd00cb23d12e544d922454868db6fe9eb77c
diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index 21f7bb3..7d8fbbc 100644
--- a/dexpreopt/config.go
+++ b/dexpreopt/config.go
@@ -268,12 +268,8 @@
// Copies of entries in GlobalConfig that are not constructable without extra parameters. They will be
// used to construct the real value manually below.
- BootJars []string
- UpdatableBootJars []string
- ArtApexJars []string
- UpdatableSystemServerJars []string
- DirtyImageObjects string
- BootImageProfiles []string
+ DirtyImageObjects string
+ BootImageProfiles []string
}
config := GlobalJSONConfig{}
@@ -283,10 +279,6 @@
}
// Construct paths that require a PathContext.
- config.GlobalConfig.BootJars = android.CreateConfiguredJarList(ctx, config.BootJars)
- config.GlobalConfig.UpdatableBootJars = android.CreateConfiguredJarList(ctx, config.UpdatableBootJars)
- config.GlobalConfig.ArtApexJars = android.CreateConfiguredJarList(ctx, config.ArtApexJars)
- config.GlobalConfig.UpdatableSystemServerJars = android.CreateConfiguredJarList(ctx, config.UpdatableSystemServerJars)
config.GlobalConfig.DirtyImageObjects = android.OptionalPathForPath(constructPath(ctx, config.DirtyImageObjects))
config.GlobalConfig.BootImageProfiles = constructPaths(ctx, config.BootImageProfiles)