diff options
Diffstat (limited to 'java/app_import.go')
| -rw-r--r-- | java/app_import.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/app_import.go b/java/app_import.go index 997274c93..5f20fdd05 100644 --- a/java/app_import.go +++ b/java/app_import.go @@ -151,7 +151,9 @@ func (a *AndroidAppImport) IsInstallable() bool { } // Updates properties with variant-specific values. -func (a *AndroidAppImport) processVariants(ctx android.LoadHookContext) { +// This happens as a DefaultableHook instead of a LoadHook because we want to run it after +// soong config variables are applied. +func (a *AndroidAppImport) processVariants(ctx android.DefaultableHookContext) { config := ctx.Config() dpiProps := reflect.ValueOf(a.dpiVariants).Elem().FieldByName("Dpi_variants") @@ -543,7 +545,7 @@ func AndroidAppImportFactory() android.Module { module.AddProperties(&module.dexpreoptProperties) module.AddProperties(&module.usesLibrary.usesLibraryProperties) module.populateAllVariantStructs() - android.AddLoadHook(module, func(ctx android.LoadHookContext) { + module.SetDefaultableHook(func(ctx android.DefaultableHookContext) { module.processVariants(ctx) }) @@ -594,7 +596,7 @@ func AndroidTestImportFactory() android.Module { module.AddProperties(&module.dexpreoptProperties) module.AddProperties(&module.testProperties) module.populateAllVariantStructs() - android.AddLoadHook(module, func(ctx android.LoadHookContext) { + module.SetDefaultableHook(func(ctx android.DefaultableHookContext) { module.processVariants(ctx) }) |