diff options
| author | 2023-03-23 16:33:36 +0000 | |
|---|---|---|
| committer | 2023-03-23 16:33:36 +0000 | |
| commit | ddfab6001487ee655552555ccf8130a09510e7e9 (patch) | |
| tree | 90eafb6d228082795aec7c51f4c1a3ce09640ea5 /java/classpath_fragment.go | |
| parent | 401a1cf0c3d774df75ed7c23b6eccec9e32c5185 (diff) | |
| parent | 8c9ae7ed6770b45f1337722a2e61cb22317659aa (diff) | |
Merge "Update min_sdk_version from SdkSpec to ApiLevel"
Diffstat (limited to 'java/classpath_fragment.go')
| -rw-r--r-- | java/classpath_fragment.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index cf81ddb5d..45e6175f2 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -130,13 +130,13 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars if s, ok := m.(*SdkLibrary); ok { // 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() { + if s.minSdkVersion.IsCurrent() { jar.minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() } else { - jar.minSdkVersion = s.minSdkVersion.ApiLevel.String() + jar.minSdkVersion = s.minSdkVersion.String() } } - if s.maxSdkVersion.Specified() { + if s.maxSdkVersion.ApiLevel.Specified() { if s.maxSdkVersion.ApiLevel.IsCurrent() { jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() } else { |