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

build/soong - support the REL platform version in classpath

Browse Source 
Make sure we select the proper API level number for the REL
platform version when generating the classpath protos

Bug: 231272086
Test: build + boot emulator
Change-Id: Ib3b711dc05dd6136a68e6de414d806687a849bc9
This commit is contained in:
Yurii Zubrytskyi
2022-05-03 01:40:32 -07:00
parent 9f2bcac707
commit 1611334fa2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/classpath_fragment.go
View File

@@ -131,14 +131,14 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars
// 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 s.minSdkVersion.Specified() {
if s.minSdkVersion.ApiLevel.IsCurrent() { if s.minSdkVersion.ApiLevel.IsCurrent() {
jar.minSdkVersion = ctx.Config().LatestPreviewApiLevel().String() jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else { } else {
jar.minSdkVersion = s.minSdkVersion.ApiLevel.String() jar.minSdkVersion = s.minSdkVersion.ApiLevel.String()
} }
} }
if s.maxSdkVersion.Specified() { if s.maxSdkVersion.Specified() {
if s.maxSdkVersion.ApiLevel.IsCurrent() { if s.maxSdkVersion.ApiLevel.IsCurrent() {
jar.maxSdkVersion = ctx.Config().LatestPreviewApiLevel().String() jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else { } else {
jar.maxSdkVersion = s.maxSdkVersion.ApiLevel.String() jar.maxSdkVersion = s.maxSdkVersion.ApiLevel.String()
} }