From 03d2cef47b3535e43876923458338b5f7679d765 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 29 Sep 2022 17:37:49 +0100 Subject: [PATCH] Add UpsideDownCake to the releases for which snapshots can be built Bug: 249769908 Test: packages/modules/common/mainline_modules_sdks.sh # With modification to add UpsideDownCake to list of releases # to build with. Change-Id: I050811e7d9a5d0a8cf54a42c03ad889defa3a251 --- sdk/build_release.go | 1 + sdk/build_release_test.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/build_release.go b/sdk/build_release.go index ac57a3279..6bb05a36d 100644 --- a/sdk/build_release.go +++ b/sdk/build_release.go @@ -100,6 +100,7 @@ var ( // Add the dessert build releases from oldest to newest. buildReleaseS = initBuildRelease("S") buildReleaseT = initBuildRelease("Tiramisu") + buildReleaseU = initBuildRelease("UpsideDownCake") // Add the current build release which is always treated as being more recent than any other // build release, including those added in tests. diff --git a/sdk/build_release_test.go b/sdk/build_release_test.go index 13730cbca..5bf57b553 100644 --- a/sdk/build_release_test.go +++ b/sdk/build_release_test.go @@ -42,7 +42,7 @@ func TestNameToRelease(t *testing.T) { android.AssertDeepEquals(t, "release", (*buildRelease)(nil), release) // Uses a wildcard in the error message to allow for additional build releases to be added to // the supported set without breaking this test. - android.FailIfNoMatchingErrors(t, `unknown release "A", expected one of \[S,Tiramisu,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) { set, err := parseBuildReleaseSet("S-F1") android.AssertDeepEquals(t, "errors", nil, err) - android.AssertStringEquals(t, "set", "[S,Tiramisu,F1]", set.String()) + android.AssertStringEquals(t, "set", "[S,Tiramisu,UpsideDownCake,F1]", set.String()) }) invalidAReleaseMessage := `unknown release "A", expected one of ` + allBuildReleaseSet.String() t.Run("invalid release", func(t *testing.T) {