diff options
| author | 2023-03-23 16:33:36 +0000 | |
|---|---|---|
| committer | 2023-03-23 16:33:36 +0000 | |
| commit | ddfab6001487ee655552555ccf8130a09510e7e9 (patch) | |
| tree | 90eafb6d228082795aec7c51f4c1a3ce09640ea5 /java/rro.go | |
| parent | 401a1cf0c3d774df75ed7c23b6eccec9e32c5185 (diff) | |
| parent | 8c9ae7ed6770b45f1337722a2e61cb22317659aa (diff) | |
Merge "Update min_sdk_version from SdkSpec to ApiLevel"
Diffstat (limited to 'java/rro.go')
| -rw-r--r-- | java/rro.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/rro.go b/java/rro.go index 9d0667cf0..49737b946 100644 --- a/java/rro.go +++ b/java/rro.go @@ -175,11 +175,11 @@ func (r *RuntimeResourceOverlay) SystemModules() string { return "" } -func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { +func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { if r.properties.Min_sdk_version != nil { - return android.SdkSpecFrom(ctx, *r.properties.Min_sdk_version) + return android.ApiLevelFrom(ctx, *r.properties.Min_sdk_version) } - return r.SdkVersion(ctx) + return r.SdkVersion(ctx).ApiLevel } func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { |