openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Drop DexPreoptImages field in dexpreopt config"

This commit is contained in:
Treehugger Robot 2021-04-27 01:53:45 +00:00 committed by Gerrit Code Review
parent 1f8a7f06d9 b19b58a015
commit bdae1e5765
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dexpreopt/config.go
View File

@ -131,7 +131,6 @@ type ModuleConfig struct {
ClassLoaderContexts ClassLoaderContextMap ClassLoaderContexts ClassLoaderContextMap
Archs []android.ArchType Archs []android.ArchType
DexPreoptImages android.Paths
DexPreoptImagesDeps []android.OutputPaths DexPreoptImagesDeps []android.OutputPaths
DexPreoptImageLocations []string DexPreoptImageLocations []string
@ -276,7 +275,6 @@ type moduleJSONConfig struct {
EnforceUsesLibrariesStatusFile string EnforceUsesLibrariesStatusFile string
ClassLoaderContexts jsonClassLoaderContextMap ClassLoaderContexts jsonClassLoaderContextMap
DexPreoptImages []string
DexPreoptImagesDeps [][]string DexPreoptImagesDeps [][]string
PreoptBootClassPathDexFiles []string PreoptBootClassPathDexFiles []string
@ -302,11 +300,10 @@ func ParseModuleConfig(ctx android.PathContext, data []byte) (*ModuleConfig, err
config.ModuleConfig.ProfileClassListing = android.OptionalPathForPath(constructPath(ctx, config.ProfileClassListing)) config.ModuleConfig.ProfileClassListing = android.OptionalPathForPath(constructPath(ctx, config.ProfileClassListing))
config.ModuleConfig.EnforceUsesLibrariesStatusFile = constructPath(ctx, config.EnforceUsesLibrariesStatusFile) config.ModuleConfig.EnforceUsesLibrariesStatusFile = constructPath(ctx, config.EnforceUsesLibrariesStatusFile)
config.ModuleConfig.ClassLoaderContexts = fromJsonClassLoaderContext(ctx, config.ClassLoaderContexts) config.ModuleConfig.ClassLoaderContexts = fromJsonClassLoaderContext(ctx, config.ClassLoaderContexts)
config.ModuleConfig.DexPreoptImages = constructPaths(ctx, config.DexPreoptImages)
config.ModuleConfig.PreoptBootClassPathDexFiles = constructPaths(ctx, config.PreoptBootClassPathDexFiles) config.ModuleConfig.PreoptBootClassPathDexFiles = constructPaths(ctx, config.PreoptBootClassPathDexFiles)
// This needs to exist, but dependencies are already handled in Make, so we don't need to pass them through JSON. // This needs to exist, but dependencies are already handled in Make, so we don't need to pass them through JSON.
config.ModuleConfig.DexPreoptImagesDeps = make([]android.OutputPaths, len(config.ModuleConfig.DexPreoptImages)) config.ModuleConfig.DexPreoptImagesDeps = make([]android.OutputPaths, len(config.ModuleConfig.Archs))
return config.ModuleConfig, nil return config.ModuleConfig, nil
} }
@ -328,7 +325,6 @@ func moduleConfigToJSON(config *ModuleConfig) ([]byte, error) {
ProfileBootListing: config.ProfileBootListing.String(), ProfileBootListing: config.ProfileBootListing.String(),
EnforceUsesLibrariesStatusFile: config.EnforceUsesLibrariesStatusFile.String(), EnforceUsesLibrariesStatusFile: config.EnforceUsesLibrariesStatusFile.String(),
ClassLoaderContexts: toJsonClassLoaderContext(config.ClassLoaderContexts), ClassLoaderContexts: toJsonClassLoaderContext(config.ClassLoaderContexts),
DexPreoptImages: config.DexPreoptImages.Strings(),
DexPreoptImagesDeps: pathsListToStringLists(config.DexPreoptImagesDeps), DexPreoptImagesDeps: pathsListToStringLists(config.DexPreoptImagesDeps),
PreoptBootClassPathDexFiles: config.PreoptBootClassPathDexFiles.Strings(), PreoptBootClassPathDexFiles: config.PreoptBootClassPathDexFiles.Strings(),
ModuleConfig: config, ModuleConfig: config,

1
dexpreopt/dexpreopt_test.go
View File

@ -47,7 +47,6 @@ func testModuleConfig(ctx android.PathContext, name, partition string) *ModuleCo
EnforceUsesLibraries: false, EnforceUsesLibraries: false,
ClassLoaderContexts: nil, ClassLoaderContexts: nil,
Archs: []android.ArchType{android.Arm}, Archs: []android.ArchType{android.Arm},
DexPreoptImages: android.Paths{android.PathForTesting("system/framework/arm/boot.art")},
DexPreoptImagesDeps: []android.OutputPaths{android.OutputPaths{}}, DexPreoptImagesDeps: []android.OutputPaths{android.OutputPaths{}},
DexPreoptImageLocations: []string{}, DexPreoptImageLocations: []string{},
PreoptBootClassPathDexFiles: nil, PreoptBootClassPathDexFiles: nil,

1
java/dexpreopt.go
View File

@ -225,7 +225,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
ClassLoaderContexts: d.classLoaderContexts, ClassLoaderContexts: d.classLoaderContexts,
Archs: archs, Archs: archs,
DexPreoptImages: images,
DexPreoptImagesDeps: imagesDeps, DexPreoptImagesDeps: imagesDeps,
DexPreoptImageLocations: imageLocations, DexPreoptImageLocations: imageLocations,