Make required a configurable property

So that users can use select statements with it.

Fixes: 347605145
Bug: 342006386
Test: m nothing --no-skip-soong-tests
Change-Id: Ica0ca6d1725b000b3748c0293e5a9f9b38ed87f9
This commit is contained in:
Cole Faust
2024-06-17 12:32:40 -07:00
parent 7dc42aa7af
commit 43ddd08bd2
12 changed files with 41 additions and 26 deletions

View File

@@ -490,6 +490,9 @@ type apexBundle struct {
javaApisUsedByModuleFile android.ModuleOutPath
aconfigFiles []android.Path
// Required modules, filled out during GenerateAndroidBuildActions and used in AndroidMk
required []string
}
// apexFileClass represents a type of file that can be included in APEX.
@@ -568,7 +571,7 @@ func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidM
if module != nil {
ret.moduleDir = ctx.OtherModuleDir(module)
ret.partition = module.PartitionTag(ctx.DeviceConfig())
ret.requiredModuleNames = module.RequiredModuleNames()
ret.requiredModuleNames = module.RequiredModuleNames(ctx)
ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()
ret.hostRequiredModuleNames = module.HostRequiredModuleNames()
ret.multilib = module.Target().Arch.ArchType.Multilib
@@ -2449,6 +2452,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.provideApexExportsInfo(ctx)
a.providePrebuiltInfo(ctx)
a.required = a.RequiredModuleNames(ctx)
}
// Set prebuiltInfoProvider. This will be used by `apex_prebuiltinfo_singleton` to print out a metadata file