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:
Dan Albert
2020-07-23 16:43:25 -07:00
parent c8060536e8
commit 0b176c8038
7 changed files with 19 additions and 19 deletions

View File

@@ -118,8 +118,8 @@ func generatePerApiVariants(ctx android.BottomUpMutatorContext, m *Module,
versionStrs = append(versionStrs, version.String())
}
}
versions = append(versions, android.CurrentApiLevel)
versionStrs = append(versionStrs, android.CurrentApiLevel.String())
versions = append(versions, android.FutureApiLevel)
versionStrs = append(versionStrs, android.FutureApiLevel.String())
modules := ctx.CreateVariations(versionStrs...)
for i, module := range modules {