diff options
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 8749a7d57..a0fcba755 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -36,10 +36,11 @@ type globalConfigAndRaw struct { func dexpreoptGlobalConfigRaw(ctx android.PathContext) globalConfigAndRaw { return ctx.Config().Once(dexpreoptGlobalConfigKey, func() interface{} { - if f := ctx.Config().DexpreoptGlobalConfig(); f != "" { + if data, err := ctx.Config().DexpreoptGlobalConfig(ctx); err != nil { + panic(err) + } else if data != nil { soongConfig := dexpreopt.CreateGlobalSoongConfig(ctx) - ctx.AddNinjaFileDeps(f) - globalConfig, data, err := dexpreopt.LoadGlobalConfig(ctx, f, soongConfig) + globalConfig, err := dexpreopt.LoadGlobalConfig(ctx, data, soongConfig) if err != nil { panic(err) } |