diff options
| -rw-r--r-- | dexpreopt/config.go | 13 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/dexpreopt/config.go b/dexpreopt/config.go index f52ecb409..23d517eb1 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -79,12 +79,10 @@ type GlobalConfig struct { CpuVariant map[android.ArchType]string // cpu variant for each architecture InstructionSetFeatures map[android.ArchType]string // instruction set for each architecture - // Only used for boot image - DirtyImageObjects android.OptionalPath // path to a dirty-image-objects file - BootImageProfiles android.Paths // path to a boot-image-profile.txt file - BootFlags string // extra flags to pass to dex2oat for the boot image - Dex2oatImageXmx string // max heap size for dex2oat for the boot image - Dex2oatImageXms string // initial heap size for dex2oat for the boot image + BootImageProfiles android.Paths // path to a boot-image-profile.txt file + BootFlags string // extra flags to pass to dex2oat for the boot image + Dex2oatImageXmx string // max heap size for dex2oat for the boot image + Dex2oatImageXms string // initial heap size for dex2oat for the boot image } // GlobalSoongConfig contains the global config that is generated from Soong, @@ -178,7 +176,6 @@ func ParseGlobalConfig(ctx android.PathContext, data []byte) (*GlobalConfig, err // Copies of entries in GlobalConfig that are not constructable without extra parameters. They will be // used to construct the real value manually below. - DirtyImageObjects string BootImageProfiles []string } @@ -189,7 +186,6 @@ func ParseGlobalConfig(ctx android.PathContext, data []byte) (*GlobalConfig, err } // Construct paths that require a PathContext. - config.GlobalConfig.DirtyImageObjects = android.OptionalPathForPath(constructPath(ctx, config.DirtyImageObjects)) config.GlobalConfig.BootImageProfiles = constructPaths(ctx, config.BootImageProfiles) return config.GlobalConfig, nil @@ -545,7 +541,6 @@ func GlobalConfigForTests(ctx android.PathContext) *GlobalConfig { EmptyDirectory: "empty_dir", CpuVariant: nil, InstructionSetFeatures: nil, - DirtyImageObjects: android.OptionalPath{}, BootImageProfiles: nil, BootFlags: "", Dex2oatImageXmx: "", diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 062005b5b..950d135be 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -622,8 +622,10 @@ func buildBootImageVariant(ctx android.SingletonContext, image *bootImageVariant cmd.FlagWithInput("--profile-file=", profile) } - if global.DirtyImageObjects.Valid() { - cmd.FlagWithInput("--dirty-image-objects=", global.DirtyImageObjects.Path()) + dirtyImageFile := "frameworks/base/config/dirty-image-objects" + dirtyImagePath := android.ExistentPathForSource(ctx, dirtyImageFile) + if dirtyImagePath.Valid() { + cmd.FlagWithInput("--dirty-image-objects=", dirtyImagePath.Path()) } if image.extends != nil { |