Convert collectJniDeps to use ModuleProxy.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I36f8b339f70ab47be84c598231cb971145fc4ef7
diff --git a/android/module.go b/android/module.go
index 2dd2f19..089f127 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1872,6 +1872,7 @@
BaseModuleName string
CanHaveApexVariants bool
MinSdkVersion string
+ SdkVersion string
NotAvailableForPlatform bool
// There some subtle differences between this one and the one above.
NotInPlatform bool
@@ -2183,6 +2184,17 @@
commonData.MinSdkVersion = mm.MinSdkVersion()
}
+ if mm, ok := m.module.(interface {
+ SdkVersion(ctx EarlyModuleContext) ApiLevel
+ }); ok {
+ ver := mm.SdkVersion(ctx)
+ if !ver.IsNone() {
+ commonData.SdkVersion = ver.String()
+ }
+ } else if mm, ok := m.module.(interface{ SdkVersion() string }); ok {
+ commonData.SdkVersion = mm.SdkVersion()
+ }
+
if m.commonProperties.ForcedDisabled {
commonData.Enabled = false
} else {