StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing missing (min|max)_sdk_version in bootclasspath.pb" into main

Browse Source
This commit is contained in:
Spandan Das
2024-06-12 18:21:33 +00:00
committed by Gerrit Code Review
parent ff18ea26f8 306804fe41
commit a551b011d0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/classpath_fragment.go
View File

@@ -128,19 +128,21 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars
return m.Name() == configuredJars.Jar(i) return m.Name() == configuredJars.Jar(i)
}, func(m android.Module) { }, func(m android.Module) {
if s, ok := m.(*SdkLibrary); ok { 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" // TODO(208456999): instead of mapping "current" to latest, min_sdk_version should never be set to "current"
if s.minSdkVersion.Specified() { if minSdkVersion.Specified() {
if s.minSdkVersion.IsCurrent() { if minSdkVersion.IsCurrent() {
jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else { } else {
jar.minSdkVersion = s.minSdkVersion.String() jar.minSdkVersion = minSdkVersion.String()
} }
} }
if s.maxSdkVersion.Specified() { if maxSdkVersion.Specified() {
if s.maxSdkVersion.IsCurrent() { if maxSdkVersion.IsCurrent() {
jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else { } else {
jar.maxSdkVersion = s.maxSdkVersion.String() jar.maxSdkVersion = maxSdkVersion.String()
} }
} }
} }