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

Merge "Allow PrevVendorApiLevel to be less than 34" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-03-11 04:56:59 +00:00
committed by Gerrit Code Review
parent 8c36631fa0 890e7722e7
commit b952c84841
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/config.go
View File

@@ -1345,13 +1345,16 @@ func (c *config) PrevVendorApiLevel() string {
panic(fmt.Errorf("Cannot parse vendor API level %s to an integer: %s", panic(fmt.Errorf("Cannot parse vendor API level %s to an integer: %s",
c.VendorApiLevel(), err)) c.VendorApiLevel(), err))
} }
if vendorApiLevel < 202404 || vendorApiLevel%100 != 4 {
panic("Unknown vendor API level " + c.VendorApiLevel())
}
// The version before trunk stable is 34. // The version before trunk stable is 34.
if vendorApiLevel == 202404 { if vendorApiLevel == 202404 {
return "34" return "34"
} }
if vendorApiLevel >= 1 && vendorApiLevel <= 34 {
return strconv.Itoa(vendorApiLevel - 1)
}
if vendorApiLevel < 202404 || vendorApiLevel%100 != 4 {
panic("Unknown vendor API level " + c.VendorApiLevel())
}
return strconv.Itoa(vendorApiLevel - 100) return strconv.Itoa(vendorApiLevel - 100)
} }