Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba45ba57 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Gerrit Code Review
Browse files

Merge "Remove PreoptExtractedApk." into main

parents 2f6b403c db93553b

dexpreopt/config.go

+0 −2
Original line number Diff line number Diff line
@@ -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

dexpreopt/dexpreopt.go

+1 −1
Original line number Diff line number Diff line
@@ -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

	}

dexpreopt/dexpreopt_test.go

+0 −1
Original line number Diff line number Diff line
@@ -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,

java/dexpreopt.go

+0 −2
Original line number Diff line number Diff line
@@ -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),