diff options
| author | 2023-03-01 23:38:49 +0000 | |
|---|---|---|
| committer | 2023-03-23 19:31:17 +0000 | |
| commit | ca70fc40bd5d7bf3b24c25de0a06c2a6df17f7ea (patch) | |
| tree | 8c21f8c82f722a14a4a63ce19b96ab84aa0081e1 /java/base.go | |
| parent | ddfab6001487ee655552555ccf8130a09510e7e9 (diff) | |
Update target_sdk_version from SdkSpec to ApiLevel
target_sdk_version signifies device version and does not need an sdkKind to
describe it fully. Update the type and cleanup existing usages. As a
side benefit, we also get better error handling since users can no
longer enter something like `public_30` as a valid target_sdk_version in bp
files
Test: m nothing
Test: no change in ninja files (this should be a no-op)
Bug: 208456999
Change-Id: I3c19245e29184bd9e5660ad8981966f64dfa9424
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/base.go b/java/base.go index a3f6e3cd1..2d213a192 100644 --- a/java/base.go +++ b/java/base.go @@ -688,11 +688,11 @@ func (j *Module) MinSdkVersionString() string { return j.minSdkVersion.String() } -func (j *Module) TargetSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { +func (j *Module) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { if j.deviceProperties.Target_sdk_version != nil { - return android.SdkSpecFrom(ctx, *j.deviceProperties.Target_sdk_version) + return android.ApiLevelFrom(ctx, *j.deviceProperties.Target_sdk_version) } - return j.SdkVersion(ctx) + return j.SdkVersion(ctx).ApiLevel } func (j *Module) AvailableFor(what string) bool { @@ -1575,7 +1575,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { j.linter.classpath = append(append(android.Paths(nil), flags.bootClasspath...), flags.classpath...) j.linter.classes = j.implementationJarFile j.linter.minSdkVersion = lintSDKVersion(j.MinSdkVersion(ctx)) - j.linter.targetSdkVersion = lintSDKVersion(j.TargetSdkVersion(ctx).ApiLevel) + j.linter.targetSdkVersion = lintSDKVersion(j.TargetSdkVersion(ctx)) j.linter.compileSdkVersion = lintSDKVersion(j.SdkVersion(ctx).ApiLevel) j.linter.compileSdkKind = j.SdkVersion(ctx).Kind j.linter.javaLanguageLevel = flags.javaVersion.String() |