diff options
| author | 2023-03-01 23:38:49 +0000 | |
|---|---|---|
| committer | 2023-03-23 19:31:17 +0000 | |
| commit | ca70fc40bd5d7bf3b24c25de0a06c2a6df17f7ea (patch) | |
| tree | 8c21f8c82f722a14a4a63ce19b96ab84aa0081e1 /java/rro.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/rro.go')
| -rw-r--r-- | java/rro.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/rro.go b/java/rro.go index 49737b946..6a9ad9aaa 100644 --- a/java/rro.go +++ b/java/rro.go @@ -186,8 +186,8 @@ func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.Ear return android.SdkSpecFrom(ctx, "") } -func (r *RuntimeResourceOverlay) TargetSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { - return r.SdkVersion(ctx) +func (r *RuntimeResourceOverlay) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { + return r.SdkVersion(ctx).ApiLevel } func (r *RuntimeResourceOverlay) Certificate() Certificate { |