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

6
android/sdk_version.go
View File

@@ -238,7 +238,7 @@ func (s SdkSpec) EffectiveVersionString(ctx EarlyModuleContext) (string, error)
var (
SdkSpecNone = SdkSpec{SdkNone, NoneApiLevel, "(no version)"}
SdkSpecPrivate = SdkSpec{SdkPrivate, PrivateApiLevel, ""}
SdkSpecPrivate = SdkSpec{SdkPrivate, FutureApiLevel, ""}
SdkSpecCorePlatform = SdkSpec{SdkCorePlatform, FutureApiLevel, "core_platform"}
)
@@ -261,7 +261,7 @@ func SdkSpecFromWithConfig(config Config, str string) SdkSpec {
var kindString string
if sep == 0 {
return SdkSpec{SdkInvalid, NewInvalidApiLevel(str), str}
return SdkSpec{SdkInvalid, NoneApiLevel, str}
} else if sep == -1 {
kindString = ""
} else {
@@ -289,7 +289,7 @@ func SdkSpecFromWithConfig(config Config, str string) SdkSpec {
apiLevel, err := ApiLevelFromUserWithConfig(config, versionString)
if err != nil {
return SdkSpec{SdkInvalid, NewInvalidApiLevel(versionString), str}
return SdkSpec{SdkInvalid, apiLevel, str}
}
return SdkSpec{kind, apiLevel, str}
}