From a26eda7f2ced8c5fdef90c7bbdabf740a637e319 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 2 Mar 2023 00:56:06 +0000 Subject: 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 --- java/java.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/java.go') 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 { -- cgit v1.2.3-59-g8ed1b