diff options
| author | 2023-03-02 00:56:06 +0000 | |
|---|---|---|
| committer | 2023-03-23 19:38:56 +0000 | |
| commit | a26eda7f2ced8c5fdef90c7bbdabf740a637e319 (patch) | |
| tree | 248d6b733e74bea2305f14b9706712d2c0d8e3ed /java/java.go | |
| parent | ca70fc40bd5d7bf3b24c25de0a06c2a6df17f7ea (diff) | |
Update max_sdk_version from SdkSpec to ApiLevel
max_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 max_sdk_version in bp
files
Bug: 208456999
Test: no change in ninja file (this should be a no-op)
Test: TH
Change-Id: I304b5ad802bde200137d8e225182828dfd6f7227
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 2a7e4e1bf..425996afc 100644 --- a/java/java.go +++ b/java/java.go @@ -1898,11 +1898,12 @@ func (j *Import) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel return j.SdkVersion(ctx).ApiLevel } -func (j *Import) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { +func (j *Import) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel { if j.properties.Replace_max_sdk_version_placeholder != nil { - return android.SdkSpecFrom(ctx, *j.properties.Replace_max_sdk_version_placeholder) + return android.ApiLevelFrom(ctx, *j.properties.Replace_max_sdk_version_placeholder) } - return android.SdkSpecFrom(ctx, "") + // Default is PrivateApiLevel + return android.SdkSpecPrivate.ApiLevel } func (j *Import) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { |