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

Revert "Add VanillaIceCream to the releases for which snapshots ..."

Browse Source 
Revert submission 26563706-CrSdk

Reason for revert: Droidmonitored triggered revert for build breakages in b/329449481

Reverted changes: /q/submissionid:26563706-CrSdk

Change-Id: Ie38cc3b6229d857a90e401fdee92b0a62bb72c3b
This commit is contained in:
Priyanka Advani
2024-03-13 17:37:29 +00:00
committed by Android (Google) Code Review
parent eb80e2b9eb
commit 2c4312b3e7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/build_release.go
View File

@@ -101,7 +101,6 @@ var (
buildReleaseS = initBuildRelease("S") buildReleaseS = initBuildRelease("S")
buildReleaseT = initBuildRelease("Tiramisu") buildReleaseT = initBuildRelease("Tiramisu")
buildReleaseU = initBuildRelease("UpsideDownCake") buildReleaseU = initBuildRelease("UpsideDownCake")
buildReleaseV = initBuildRelease("VanillaIceCream")
// Add the current build release which is always treated as being more recent than any other // Add the current build release which is always treated as being more recent than any other
// build release, including those added in tests. // build release, including those added in tests.

4
sdk/build_release_test.go
View File

@@ -42,7 +42,7 @@ func TestNameToRelease(t *testing.T) {
android.AssertDeepEquals(t, "release", (*buildRelease)(nil), release) android.AssertDeepEquals(t, "release", (*buildRelease)(nil), release)
// Uses a wildcard in the error message to allow for additional build releases to be added to // Uses a wildcard in the error message to allow for additional build releases to be added to
// the supported set without breaking this test. // the supported set without breaking this test.
android.FailIfNoMatchingErrors(t, `unknown release "A", expected one of \[S,Tiramisu,UpsideDownCake,VanillaIceCream,F1,F2,current\]`, []error{err}) android.FailIfNoMatchingErrors(t, `unknown release "A", expected one of \[S,Tiramisu,UpsideDownCake,F1,F2,current\]`, []error{err})
}) })
} }
@@ -60,7 +60,7 @@ func TestParseBuildReleaseSet(t *testing.T) {
t.Run("closed range", func(t *testing.T) { t.Run("closed range", func(t *testing.T) {
set, err := parseBuildReleaseSet("S-F1") set, err := parseBuildReleaseSet("S-F1")
android.AssertDeepEquals(t, "errors", nil, err) android.AssertDeepEquals(t, "errors", nil, err)
android.AssertStringEquals(t, "set", "[S,Tiramisu,UpsideDownCake,VanillaIceCream,F1]", set.String()) android.AssertStringEquals(t, "set", "[S,Tiramisu,UpsideDownCake,F1]", set.String())
}) })
invalidAReleaseMessage := `unknown release "A", expected one of ` + allBuildReleaseSet.String() invalidAReleaseMessage := `unknown release "A", expected one of ` + allBuildReleaseSet.String()
t.Run("invalid release", func(t *testing.T) { t.Run("invalid release", func(t *testing.T) {