summaryrefslogtreecommitdiff
path: root/java/classpath_fragment.go
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2022-08-15 21:59:11 -0700
committer Xin Li <delphij@google.com> 2022-08-15 21:59:11 -0700
commit2822186571d46c970f00f720fd08c28830e62c8d (patch)
treebad6e905f39fdb8891dfcb6cbe0e5de0c74da301 /java/classpath_fragment.go
parent90fbcf1c29d81486c4af5c6dd3da61d63c3d06ad (diff)
parent6b56c375a13e5edf617a969654a65959a37edc2d (diff)
DO NOT MERGE - Merge Android 13
Bug: 242648940 Merged-In: I90e7df9875594a1257e582ef62bac5084f0f939d Change-Id: I9655a6c1a7e7e5a2c29d9fcee7e1411dad45bd1c
Diffstat (limited to 'java/classpath_fragment.go')
-rw-r--r--java/classpath_fragment.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go
index ca2752877..259e977d8 100644
--- a/java/classpath_fragment.go
+++ b/java/classpath_fragment.go
@@ -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()
}