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 am: b952c84841

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2988349

Change-Id: I91a1971b37054084f0b6ea333ea2a839d8461d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-03-11 05:44:42 +00:00
committed by Automerger Merge Worker
parent e91b089b84 b952c84841
commit 36741000cb
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",
c.VendorApiLevel(), err))
}
if vendorApiLevel < 202404 || vendorApiLevel%100 != 4 {
panic("Unknown vendor API level " + c.VendorApiLevel())
}
// The version before trunk stable is 34.
if vendorApiLevel == 202404 {
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)
}