diff options
| author | 2023-03-28 19:17:48 +0000 | |
|---|---|---|
| committer | 2023-03-28 19:17:48 +0000 | |
| commit | 5aade5f52d4d8e39117a4689565dae6ec1abba46 (patch) | |
| tree | 54fbfdfaba304701cd222cdf77d90a3672e97fb2 /java/java.go | |
| parent | 9e30ad39ba6d477440e96d40d3dde192246a11c8 (diff) | |
| parent | a26eda7f2ced8c5fdef90c7bbdabf740a637e319 (diff) | |
Merge "Update max_sdk_version from SdkSpec to ApiLevel"
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 370781599..c0636f716 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 { |