Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7babdbf authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent db07f002

java/bootclasspath_fragment.go

+3 −3
Original line number Diff line number Diff line
@@ -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) {

java/sdk_library.go

+1 −1
Original line number Diff line number Diff line
@@ -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

}

sdk/build_release.go

+1 −1
Original line number Diff line number Diff line
@@ -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.

sdk/build_release_test.go

+5 −5
Original line number Diff line number Diff line
@@ -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

	}