summaryrefslogtreecommitdiff
path: root/java/rro.go
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2023-03-02 00:56:06 +0000
committer Spandan Das <spandandas@google.com> 2023-03-23 19:38:56 +0000
commita26eda7f2ced8c5fdef90c7bbdabf740a637e319 (patch)
tree248d6b733e74bea2305f14b9706712d2c0d8e3ed /java/rro.go
parentca70fc40bd5d7bf3b24c25de0a06c2a6df17f7ea (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/rro.go')
-rw-r--r--java/rro.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/rro.go b/java/rro.go
index 6a9ad9aaa..53faca069 100644
--- a/java/rro.go
+++ b/java/rro.go
@@ -182,8 +182,8 @@ func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) a
return r.SdkVersion(ctx).ApiLevel
}
-func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec {
- return android.SdkSpecFrom(ctx, "")
+func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel {
+ return android.SdkSpecPrivate.ApiLevel
}
func (r *RuntimeResourceOverlay) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {