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

Commit d9a1829b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "variant-flags" into main am: 49474856 

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



Change-Id: I4ce141dea0092504cedc288b4b9880964ffcd185
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 830fde9c 49474856

cmd/release_config/release_config_lib/release_config.go

+10 −0
Original line number Diff line number Diff line
@@ -91,6 +91,16 @@ type ReleaseConfig struct { 
	ReleaseConfigType rc_proto.ReleaseConfigType

}



// If true, this is a proper release config that can be used in "lunch".

func (config *ReleaseConfig) isConfigListable() bool {

	switch config.ReleaseConfigType {

	case rc_proto.ReleaseConfigType_RELEASE_CONFIG:

		return true

	}



	return false

}



// If true, this ReleaseConfigType may only inherit from a ReleaseConfig of the

// same ReleaseConfigType.

var ReleaseConfigInheritanceDenyMap = map[rc_proto.ReleaseConfigType]bool{

cmd/release_config/release_config_lib/release_configs.go

+4 −2
Original line number Diff line number Diff line
@@ -449,9 +449,11 @@ func (configs *ReleaseConfigs) getReleaseConfig(name string, allow_missing bool) 
func (configs *ReleaseConfigs) GetAllReleaseNames() []string {

	var allReleaseNames []string

	for _, v := range configs.ReleaseConfigs {

		if v.isConfigListable() {

			allReleaseNames = append(allReleaseNames, v.Name)

			allReleaseNames = append(allReleaseNames, v.OtherNames...)

		}

	}

	slices.Sort(allReleaseNames)

	return allReleaseNames

}