From e7babdbfe14abb57aacd36f8d92a8af9efaa7a97 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 10 Feb 2022 13:06:54 +0000 Subject: [PATCH] Use Tiramisu instead of T in supported_build_releases Make this consistent with how code names are used in the rest of Soong. Bug: 204763318 Test: m nothing Change-Id: I1f2f40310df9d619db6aaaad3ed7339bb5e79194 --- java/bootclasspath_fragment.go | 6 +++--- java/sdk_library.go | 2 +- sdk/build_release.go | 2 +- sdk/build_release_test.go | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index a36bd6a63..5fe409e25 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -931,13 +931,13 @@ type bootclasspathFragmentSdkMemberProperties struct { All_flags_path android.OptionalPath `supported_build_releases:"S"` // The path to the generated signature-patterns.csv file. - Signature_patterns_path android.OptionalPath `supported_build_releases:"T+"` + Signature_patterns_path android.OptionalPath `supported_build_releases:"Tiramisu+"` // The path to the generated filtered-stub-flags.csv file. - Filtered_stub_flags_path android.OptionalPath `supported_build_releases:"T+"` + Filtered_stub_flags_path android.OptionalPath `supported_build_releases:"Tiramisu+"` // The path to the generated filtered-flags.csv file. - Filtered_flags_path android.OptionalPath `supported_build_releases:"T+"` + Filtered_flags_path android.OptionalPath `supported_build_releases:"Tiramisu+"` } func (b *bootclasspathFragmentSdkMemberProperties) PopulateFromVariant(ctx android.SdkMemberContext, variant android.Module) { diff --git a/java/sdk_library.go b/java/sdk_library.go index 6a2a7a845..7362cfbce 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -2808,7 +2808,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 } diff --git a/sdk/build_release.go b/sdk/build_release.go index 2bcdc6f57..4c2277e85 100644 --- a/sdk/build_release.go +++ b/sdk/build_release.go @@ -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. diff --git a/sdk/build_release_test.go b/sdk/build_release_test.go index 6608be4f8..6f1ef9e30 100644 --- a/sdk/build_release_test.go +++ b/sdk/build_release_test.go @@ -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 }