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

Commit 3fcba09c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8557337 from 2c268407 to tm-release 

Change-Id: I2f98223fe9ce41ace22dcaa21fda6ab620b3a015
parents 010fa7db 2c268407

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()

						}

java/droidstubs.go

+1 −2
Original line number Diff line number Diff line
@@ -379,8 +379,7 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a 
	cmd.FlagWithOutput("--generate-api-levels ", d.apiVersionsXml)

	cmd.FlagWithInput("--apply-api-levels ", d.apiVersionsXml)

	cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())

	// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD

	// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())

	cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())



	filename := proptools.StringDefault(d.properties.Api_levels_jar_filename, "android.jar")