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

Remove unnecessary properties in GlobalJSONConfig am: 7ccacaedbe am: 1a9f05649b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471780

Change-Id: I62656cdf625f104d925b912ad47a84722a5409e3
This commit is contained in:
Paul Duffin
2020-10-27 17:09:52 +00:00
committed by Automerger Merge Worker
parent 3e29458b28 1a9f05649b
commit 55cf474711
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dexpreopt/config.go
View File

@@ -268,12 +268,8 @@ func ParseGlobalConfig(ctx android.PathContext, data []byte) (*GlobalConfig, err
// Copies of entries in GlobalConfig that are not constructable without extra parameters. They will be // Copies of entries in GlobalConfig that are not constructable without extra parameters. They will be
// used to construct the real value manually below. // used to construct the real value manually below.
BootJars []string DirtyImageObjects string
UpdatableBootJars []string BootImageProfiles []string
ArtApexJars []string
UpdatableSystemServerJars []string
DirtyImageObjects string
BootImageProfiles []string
} }
config := GlobalJSONConfig{} config := GlobalJSONConfig{}
@@ -283,10 +279,6 @@ func ParseGlobalConfig(ctx android.PathContext, data []byte) (*GlobalConfig, err
} }
// Construct paths that require a PathContext. // 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.DirtyImageObjects = android.OptionalPathForPath(constructPath(ctx, config.DirtyImageObjects))
config.GlobalConfig.BootImageProfiles = constructPaths(ctx, config.BootImageProfiles) config.GlobalConfig.BootImageProfiles = constructPaths(ctx, config.BootImageProfiles)