Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1611334f authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

build/soong - support the REL platform version in classpath 

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
parent 9f2bcac7

java/classpath_fragment.go

+2 −2
Original line number Diff line number Diff line
@@ -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"

					if s.minSdkVersion.Specified() {

						if s.minSdkVersion.ApiLevel.IsCurrent() {

							jar.minSdkVersion = ctx.Config().LatestPreviewApiLevel().String()

							jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()

						} else {

							jar.minSdkVersion = s.minSdkVersion.ApiLevel.String()

						}

					}

					if s.maxSdkVersion.Specified() {

						if s.maxSdkVersion.ApiLevel.IsCurrent() {

							jar.maxSdkVersion = ctx.Config().LatestPreviewApiLevel().String()

							jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()

						} else {

							jar.maxSdkVersion = s.maxSdkVersion.ApiLevel.String()

						}