diff options
Diffstat (limited to 'java/classpath_fragment.go')
| -rw-r--r-- | java/classpath_fragment.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index 07bc5c163..18a5dae6c 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -128,19 +128,21 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars return m.Name() == configuredJars.Jar(i) }, func(m android.Module) { if s, ok := m.(*SdkLibrary); ok { + minSdkVersion := s.MinSdkVersion(ctx) + maxSdkVersion := s.MaxSdkVersion(ctx) // TODO(208456999): instead of mapping "current" to latest, min_sdk_version should never be set to "current" - if s.minSdkVersion.Specified() { - if s.minSdkVersion.IsCurrent() { + if minSdkVersion.Specified() { + if minSdkVersion.IsCurrent() { jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() } else { - jar.minSdkVersion = s.minSdkVersion.String() + jar.minSdkVersion = minSdkVersion.String() } } - if s.maxSdkVersion.Specified() { - if s.maxSdkVersion.IsCurrent() { + if maxSdkVersion.Specified() { + if maxSdkVersion.IsCurrent() { jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() } else { - jar.maxSdkVersion = s.maxSdkVersion.String() + jar.maxSdkVersion = maxSdkVersion.String() } } } |