Update min_sdk_version from SdkSpec to ApiLevel
min_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 min_sdk_version in bp files Will do a similar cleanup for targetSdkVersion and maxSdkVersion in a followup CL Test: m nothing Test: no change in ninja files (this should be a no-op) Bug: 208456999 Change-Id: Ie6ae7e267d093c5e4787e82685daaca1021d202e
This commit is contained in:
@@ -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 {
|
||||
|
Reference in New Issue
Block a user