diff options
Diffstat (limited to 'java/dexpreopt.go')
| -rw-r--r-- | java/dexpreopt.go | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index cb6427b8d..a89731ac8 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -83,11 +83,7 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.ModuleContext) bool { var dexpreoptGlobalConfigKey = android.NewOnceKey("DexpreoptGlobalConfig") -func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.ModuleOutPath) android.ModuleOutPath { - if d.dexpreoptDisabled(ctx) { - return dexJarFile - } - +func getGlobalConfig(ctx android.ModuleContext) dexpreopt.GlobalConfig { globalConfig := ctx.Config().Once(dexpreoptGlobalConfigKey, func() interface{} { if f := ctx.Config().DexpreoptGlobalConfig(); f != "" { ctx.AddNinjaFileDeps(f) @@ -99,6 +95,19 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo } return dexpreopt.GlobalConfig{} }).(dexpreopt.GlobalConfig) + return globalConfig +} + +func odexOnSystemOther(ctx android.ModuleContext, installPath android.OutputPath) bool { + return dexpreopt.OdexOnSystemOtherByName(ctx.ModuleName(), android.InstallPathToOnDevicePath(ctx, installPath), getGlobalConfig(ctx)) +} + +func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.ModuleOutPath) android.ModuleOutPath { + if d.dexpreoptDisabled(ctx) { + return dexJarFile + } + + globalConfig := getGlobalConfig(ctx) var archs []android.ArchType for _, a := range ctx.MultiTargets() { |