Replace FutureApiLevel with an ApiLevel.
Keeping the int constant around for now as FutureApiLevelInt because it's still useful in places that haven't adopted ApiLevel yet for testing if their non-ApiLevel API level is current or not. Test: treehugger Bug: http://b/154667674 Change-Id: I47a7012703f41fdeb56f91edf9c83afa93042deb
This commit is contained in:
@@ -1955,7 +1955,7 @@ func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.Paylo
|
||||
func (a *apexBundle) minSdkVersion(ctx android.BaseModuleContext) android.ApiLevel {
|
||||
ver := proptools.String(a.properties.Min_sdk_version)
|
||||
if ver == "" {
|
||||
return android.CurrentApiLevel
|
||||
return android.FutureApiLevel
|
||||
}
|
||||
apiLevel, err := android.ApiLevelFromUser(ctx, ver)
|
||||
if err != nil {
|
||||
@@ -1964,7 +1964,7 @@ func (a *apexBundle) minSdkVersion(ctx android.BaseModuleContext) android.ApiLev
|
||||
}
|
||||
if apiLevel.IsPreview() {
|
||||
// All codenames should build against "current".
|
||||
return android.CurrentApiLevel
|
||||
return android.FutureApiLevel
|
||||
}
|
||||
return apiLevel
|
||||
}
|
||||
|
Reference in New Issue
Block a user