Convert buildApexDependencyInfo to use ModuleProxy.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I7527d331b31a3a97587ca76105e9facb99624bde
diff --git a/android/module.go b/android/module.go
index a9f6b94..c2f4342 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1871,6 +1871,8 @@
SkipAndroidMkProcessing bool
BaseModuleName string
CanHaveApexVariants bool
+ MinSdkVersion string
+ NotAvailableForPlatform bool
}
var CommonModuleInfoKey = blueprint.NewProvider[CommonModuleInfo]()
@@ -2141,13 +2143,26 @@
SkipAndroidMkProcessing: shouldSkipAndroidMkProcessing(ctx, m),
BaseModuleName: m.BaseModuleName(),
}
+ if mm, ok := m.module.(interface {
+ MinSdkVersion(ctx EarlyModuleContext) ApiLevel
+ }); ok {
+ ver := mm.MinSdkVersion(ctx)
+ if !ver.IsNone() {
+ commonData.MinSdkVersion = ver.String()
+ }
+ } else if mm, ok := m.module.(interface{ MinSdkVersion() string }); ok {
+ commonData.MinSdkVersion = mm.MinSdkVersion()
+ }
+
if m.commonProperties.ForcedDisabled {
commonData.Enabled = false
} else {
commonData.Enabled = m.commonProperties.Enabled.GetOrDefault(m.ConfigurableEvaluator(ctx), !m.Os().DefaultDisabled)
}
- am, ok := m.module.(ApexModule)
- commonData.CanHaveApexVariants = ok && am.CanHaveApexVariants()
+ if am, ok := m.module.(ApexModule); ok {
+ commonData.CanHaveApexVariants = am.CanHaveApexVariants()
+ commonData.NotAvailableForPlatform = am.NotAvailableForPlatform()
+ }
SetProvider(ctx, CommonModuleInfoKey, commonData)
if p, ok := m.module.(PrebuiltInterface); ok && p.Prebuilt() != nil {
SetProvider(ctx, PrebuiltModuleProviderKey, PrebuiltModuleProviderData{})