diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/module.go b/android/module.go index 56cfc4cbd..738f5435b 100644 --- a/android/module.go +++ b/android/module.go @@ -1892,12 +1892,14 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) } } - m.module.GenerateAndroidBuildActions(ctx) + // Call aconfigUpdateAndroidBuildActions to collect merged aconfig files before being used + // in m.module.GenerateAndroidBuildActions + aconfigUpdateAndroidBuildActions(ctx) if ctx.Failed() { return } - aconfigUpdateAndroidBuildActions(ctx) + m.module.GenerateAndroidBuildActions(ctx) if ctx.Failed() { return } |