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

Commit 38310bb4 authored by Colin Cross's avatar Colin Cross
Browse files

Only get dexpreopt config for device modules 

Calling dexpreopt.GetGlobalConfig can return errors, move the checks
that don't depend on dexpreopt.GetGlobalConfig first to avoid
breaking all modules when the global config is invalid, for example
in a partial branch that is missing the BootProfileImages file.

Bug: 207813628
Test: tradefed branch builds
Change-Id: Id1689de3f1ef986a41a60622cb357edb9d323b8a
parent 9579f4c0

java/dexpreopt.go

+11 −11
Original line number Diff line number Diff line
@@ -122,29 +122,33 @@ func moduleName(ctx android.BaseModuleContext) string { 
}



func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {

	global := dexpreopt.GetGlobalConfig(ctx)

	if !ctx.Device() {

		return true

	}



	if global.DisablePreopt {

	if d.isTest {

		return true

	}



	if inList(moduleName(ctx), global.DisablePreoptModules) {

	if !BoolDefault(d.dexpreoptProperties.Dex_preopt.Enabled, true) {

		return true

	}



	if d.isTest {

	if !ctx.Module().(DexpreopterInterface).IsInstallable() {

		return true

	}



	if !BoolDefault(d.dexpreoptProperties.Dex_preopt.Enabled, true) {

	if !android.IsModulePreferred(ctx.Module()) {

		return true

	}



	if !ctx.Module().(DexpreopterInterface).IsInstallable() {

	global := dexpreopt.GetGlobalConfig(ctx)



	if global.DisablePreopt {

		return true

	}



	if ctx.Host() {

	if inList(moduleName(ctx), global.DisablePreoptModules) {

		return true

	}
@@ -161,10 +165,6 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool { 
		}

	}



	if !android.IsModulePreferred(ctx.Module()) {

		return true

	}



	// TODO: contains no java code



	return false