Update min_sdk_version from SdkSpec to ApiLevel

This relands aosp/2457063. The original change broke T and U since those
branches still contain soong modules of type (kind+level). Those soong
modules have been cleaned up now

Test: Used go/abtd to test T and U branches with this change

Bug: 208456999
Change-Id: I0ef7933c055f88cb512a02108f1173e51156ef1c
This commit is contained in:
Spandan Das
2023-03-03 21:20:36 +00:00
parent 7947b31a55
commit 8c9ae7ed67
18 changed files with 83 additions and 71 deletions

View File

@@ -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 {