android/androidmk.go: Calls *RequiredModuleNames() to get required modules

Instead of writing commonProperties.*Required as
LOCAL_*REQUIRED_MODULES, call android.Module.*RequiredModuleNames() to
retrieve list of required, so that the required modules can be modified
by overriding the interface method.

Bug: 191369319
Test: Presubmit
Change-Id: I61fcb82496dcc06831fb42f5af1b53f01999a8d1
This commit is contained in:
Yi-Yo Chiang
2021-06-18 19:35:39 +08:00
parent dcbc76134d
commit 4fcfb53f7b

View File

@@ -486,9 +486,9 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
if a.Include == "" {
a.Include = "$(BUILD_PREBUILT)"
}
a.Required = append(a.Required, amod.commonProperties.Required...)
a.Host_required = append(a.Host_required, amod.commonProperties.Host_required...)
a.Target_required = append(a.Target_required, amod.commonProperties.Target_required...)
a.Required = append(a.Required, mod.(Module).RequiredModuleNames()...)
a.Host_required = append(a.Host_required, mod.(Module).HostRequiredModuleNames()...)
a.Target_required = append(a.Target_required, mod.(Module).TargetRequiredModuleNames()...)
for _, distString := range a.GetDistForGoals(mod) {
fmt.Fprintf(&a.header, distString)