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

Use Tiramisu instead of T in supported_build_releases

Browse Source 
Make this consistent with how code names are used in the rest of Soong.

Bug: 204763318
Test: m nothing
Change-Id: I1f2f40310df9d619db6aaaad3ed7339bb5e79194
Merged-In: I1f2f40310df9d619db6aaaad3ed7339bb5e79194
(cherry picked from commit e7babdbfe1)
This commit is contained in:
Paul Duffin
2022-02-10 13:06:54 +00:00
parent 7a57bb1063
commit 9b4eab604d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/sdk_library.go
View File

@@ -2562,7 +2562,7 @@ type scopeProperties struct {
StubsSrcJar android.Path
CurrentApiFile android.Path
RemovedApiFile android.Path
AnnotationsZip android.Path `supported_build_releases:"T+"`
AnnotationsZip android.Path `supported_build_releases:"Tiramisu+"`
SdkVersion string
}

2
sdk/build_release.go
View File

@@ -85,7 +85,7 @@ var (
// Add the build releases from oldest to newest.
buildReleaseS = initBuildRelease("S")
buildReleaseT = initBuildRelease("T")
buildReleaseT = initBuildRelease("Tiramisu")
)
// initBuildRelease creates a new build release with the specified name.

10
sdk/build_release_test.go
View File

@@ -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,T,F1]", set.String())
android.AssertStringEquals(t, "set", "[S,Tiramisu,F1]", set.String())
})
invalidAReleaseMessage := `unknown release "A", expected one of ` + allBuildReleaseSet.String()
t.Run("invalid release", func(t *testing.T) {
@@ -79,7 +79,7 @@ func TestParseBuildReleaseSet(t *testing.T) {
android.AssertStringDoesContain(t, "errors", fmt.Sprint(err), invalidAReleaseMessage)
})
t.Run("invalid release in closed range end", func(t *testing.T) {
set, err := parseBuildReleaseSet("T-A")
set, err := parseBuildReleaseSet("Tiramisu-A")
android.AssertDeepEquals(t, "set", (*buildReleaseSet)(nil), set)
android.AssertStringDoesContain(t, "errors", fmt.Sprint(err), invalidAReleaseMessage)
})
@@ -128,13 +128,13 @@ func TestPropertyPrunerByBuildRelease(t *testing.T) {
type mapped struct {
Default string
T_only string `supported_build_releases:"T"`
T_only string `supported_build_releases:"Tiramisu"`
}
type testBuildReleasePruner struct {
Default string
S_and_T_only string `supported_build_releases:"S-T"`
T_later string `supported_build_releases:"T+"`
S_and_T_only string `supported_build_releases:"S-Tiramisu"`
T_later string `supported_build_releases:"Tiramisu+"`
Nested nested
Mapped map[string]*mapped
}