summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
author Kornel Dulęba <korneld@google.com> 2024-11-25 10:46:27 +0000
committer Kornel Dulęba <korneld@google.com> 2024-11-27 10:46:53 +0000
commit785fbd539388db15194bfddb2cf845b742d6473f (patch)
tree4bdc0cef4f5badc9e5ed45aae5d4999b3555a7dd /cmd
parent9ef6edba2c85663fc32738d061e525090b2bb638 (diff)
Don't list build variant release configs
The build variant release configs are not meant to be used in lunch and therefore shouldn't be listed in ALL_RELEASE_CONFIGS_FOR_PRODUCT. Otherwise one can do something like "lunch husky-user-user", which doesn't sound right. Bug: b/378961230 Test: build/soong/bin/list_releases husky Change-Id: Ie7a5487aa85018b430c5b816d902149184903eee
Diffstat (limited to 'cmd')
-rw-r--r--cmd/release_config/release_config_lib/release_config.go10
-rw-r--r--cmd/release_config/release_config_lib/release_configs.go6
2 files changed, 14 insertions, 2 deletions
diff --git a/cmd/release_config/release_config_lib/release_config.go b/cmd/release_config/release_config_lib/release_config.go
index 8d210026a..719ddc08c 100644
--- a/cmd/release_config/release_config_lib/release_config.go
+++ b/cmd/release_config/release_config_lib/release_config.go
@@ -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{
diff --git a/cmd/release_config/release_config_lib/release_configs.go b/cmd/release_config/release_config_lib/release_configs.go
index f616230f9..4f621c70a 100644
--- a/cmd/release_config/release_config_lib/release_configs.go
+++ b/cmd/release_config/release_config_lib/release_configs.go
@@ -449,8 +449,10 @@ func (configs *ReleaseConfigs) getReleaseConfig(name string, allow_missing bool)
func (configs *ReleaseConfigs) GetAllReleaseNames() []string {
var allReleaseNames []string
for _, v := range configs.ReleaseConfigs {
- allReleaseNames = append(allReleaseNames, v.Name)
- allReleaseNames = append(allReleaseNames, v.OtherNames...)
+ if v.isConfigListable() {
+ allReleaseNames = append(allReleaseNames, v.Name)
+ allReleaseNames = append(allReleaseNames, v.OtherNames...)
+ }
}
slices.Sort(allReleaseNames)
return allReleaseNames