tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use Tiramisu instead of T in supported_build_releases" am: 52aad81d45 am: fcb871ac39

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

Change-Id: I57d015db9976afaf5ca725e86807822c30614a23
This commit is contained in:
Treehugger Robot 2022-02-10 16:46:32 +00:00 committed by Automerger Merge Worker
commit 5bf9b0691e
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/bootclasspath_fragment.go
View file

@ -931,13 +931,13 @@ type bootclasspathFragmentSdkMemberProperties struct {
All_flags_path android.OptionalPath `supported_build_releases:"S"` All_flags_path android.OptionalPath `supported_build_releases:"S"`
// The path to the generated signature-patterns.csv file. // 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. // 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. // 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) { func (b *bootclasspathFragmentSdkMemberProperties) PopulateFromVariant(ctx android.SdkMemberContext, variant android.Module) {

2
java/sdk_library.go
View file

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

2
sdk/build_release.go
View file

@ -85,7 +85,7 @@ var (
// Add the build releases from oldest to newest. // Add the build releases from oldest to newest.
buildReleaseS = initBuildRelease("S") buildReleaseS = initBuildRelease("S")
buildReleaseT = initBuildRelease("T") buildReleaseT = initBuildRelease("Tiramisu")
) )
// initBuildRelease creates a new build release with the specified name. // 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) { 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,T,F1]", set.String()) android.AssertStringEquals(t, "set", "[S,Tiramisu,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) {
@ -79,7 +79,7 @@ func TestParseBuildReleaseSet(t *testing.T) {
android.AssertStringDoesContain(t, "errors", fmt.Sprint(err), invalidAReleaseMessage) android.AssertStringDoesContain(t, "errors", fmt.Sprint(err), invalidAReleaseMessage)
}) })
t.Run("invalid release in closed range end", func(t *testing.T) { 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.AssertDeepEquals(t, "set", (*buildReleaseSet)(nil), set)
android.AssertStringDoesContain(t, "errors", fmt.Sprint(err), invalidAReleaseMessage) android.AssertStringDoesContain(t, "errors", fmt.Sprint(err), invalidAReleaseMessage)
}) })
@ -128,13 +128,13 @@ func TestPropertyPrunerByBuildRelease(t *testing.T) {
type mapped struct { type mapped struct {
Default string Default string
T_only string `supported_build_releases:"T"` T_only string `supported_build_releases:"Tiramisu"`
} }
type testBuildReleasePruner struct { type testBuildReleasePruner struct {
Default string Default string
S_and_T_only string `supported_build_releases:"S-T"` S_and_T_only string `supported_build_releases:"S-Tiramisu"`
T_later string `supported_build_releases:"T+"` T_later string `supported_build_releases:"Tiramisu+"`
Nested nested Nested nested
Mapped map[string]*mapped Mapped map[string]*mapped
} }