StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Create two sentinel api levels"

Browse Source 
Revert submission 2457063

Reason for revert: Broken udc-dev

Reverted changes: /q/submissionid:2457063

Change-Id: Ide8e1b23d5a575c57be44ebd801846dc5caf2e83
This commit is contained in:
Spandan Das
2023-03-21 01:36:46 +00:00
parent 51dc6859ac
commit ac96191f22
4 changed files with 5 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
android/api_levels.go
View File

@@ -55,9 +55,6 @@ type ApiLevel struct {
}
func (this ApiLevel) FinalInt() int {
if this.IsInvalid() {
panic(fmt.Errorf("%v is not a recognized api_level\n", this))
}
if this.IsPreview() {
panic("Requested a final int from a non-final ApiLevel")
} else {
@@ -66,9 +63,6 @@ func (this ApiLevel) FinalInt() int {
}
func (this ApiLevel) FinalOrFutureInt() int {
if this.IsInvalid() {
panic(fmt.Errorf("%v is not a recognized api_level\n", this))
}
if this.IsPreview() {
return FutureApiLevelInt
} else {
@@ -82,9 +76,6 @@ func (this ApiLevel) FinalOrFutureInt() int {
// - preview codenames -> preview base (9000) + index
// - otherwise -> cast to int
func (this ApiLevel) FinalOrPreviewInt() int {
if this.IsInvalid() {
panic(fmt.Errorf("%v is not a recognized api_level\n", this))
}
if this.IsCurrent() {
return this.number
}
@@ -106,11 +97,6 @@ func (this ApiLevel) IsPreview() bool {
return this.isPreview
}
// Returns true if the raw api level string is invalid
func (this ApiLevel) IsInvalid() bool {
return this.EqualTo(InvalidApiLevel)
}
// Returns true if this is the unfinalized "current" API level. This means
// different things across Java and native. Java APIs do not use explicit
// codenames, so all non-final codenames are grouped into "current". For native
@@ -127,12 +113,6 @@ func (this ApiLevel) IsNone() bool {
return this.number == -1
}
// Returns true if an app is compiling against private apis.
// e.g. if sdk_version = "" in Android.bp, then the ApiLevel of that "sdk" is at PrivateApiLevel.
func (this ApiLevel) IsPrivate() bool {
return this.number == PrivateApiLevel.number
}
// Returns -1 if the current API level is less than the argument, 0 if they
// are equal, and 1 if it is greater than the argument.
func (this ApiLevel) CompareTo(other ApiLevel) int {
@@ -186,19 +166,6 @@ var NoneApiLevel = ApiLevel{
isPreview: true,
}
// Sentinel ApiLevel to validate that an apiLevel is either an int or a recognized codename.
var InvalidApiLevel = NewInvalidApiLevel("invalid")
// Returns an apiLevel object at the same level as InvalidApiLevel.
// The object contains the raw string provied in bp file, and can be used for error handling.
func NewInvalidApiLevel(raw string) ApiLevel {
return ApiLevel{
value: raw,
number: -2, // One less than NoneApiLevel
isPreview: true,
}
}
// The first version that introduced 64-bit ABIs.
var FirstLp64Version = uncheckedFinalApiLevel(21)