diff --git a/dexpreopt/config.go b/dexpreopt/config.go index c871e85bf..61639521e 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -184,8 +184,6 @@ type ModuleConfig struct { PreoptBootClassPathDexFiles android.Paths // file paths of boot class path files PreoptBootClassPathDexLocations []string // virtual locations of boot class path files - PreoptExtractedApk bool // Overrides OnlyPreoptModules - NoCreateAppImage bool ForceCreateAppImage bool diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index c13e14ad2..94707bafa 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -124,7 +124,7 @@ func dexpreoptDisabled(ctx android.PathContext, global *GlobalConfig, module *Mo return true } - if global.OnlyPreoptArtBootImage && !module.PreoptExtractedApk { + if global.OnlyPreoptArtBootImage { return true } diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go index 2b19c9db5..230fbb4de 100644 --- a/dexpreopt/dexpreopt_test.go +++ b/dexpreopt/dexpreopt_test.go @@ -87,7 +87,6 @@ func createTestModuleConfig(name, dexLocation string, buildPath, dexPath, enforc DexPreoptImageLocationsOnHost: []string{}, PreoptBootClassPathDexFiles: nil, PreoptBootClassPathDexLocations: nil, - PreoptExtractedApk: false, NoCreateAppImage: false, ForceCreateAppImage: false, PresignedPrebuilt: false, diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 998730e08..fe8c5fbac 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -374,8 +374,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr PreoptBootClassPathDexFiles: dexFiles.Paths(), PreoptBootClassPathDexLocations: dexLocations, - PreoptExtractedApk: false, - NoCreateAppImage: !BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, true), ForceCreateAppImage: BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, false),