Merge changes from topic "list_releases" into main

* changes:
  Add list_releases command
  Add standalone list_products and list_variants commands.
This commit is contained in:
Joe Onorato 2024-05-31 20:22:06 +00:00 committed by Gerrit Code Review
commit 5219ed0b4b
4 changed files with 99 additions and 2 deletions

32
bin/list_products Executable file
View file

@ -0,0 +1,32 @@
#!/bin/bash
# Copyright (C) 2024 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Common script utilities
source $(cd $(dirname $BASH_SOURCE) &> /dev/null && pwd)/../../make/shell_utils.sh
require_top
# In almost call cases including get_build_var, TARGET_RELEASE is required,
# but the list of available products is not dependent on the release config
# (but note that the list of available release configs is dependent on the
# product). So for list_products, we'll just set it to trunk_staging, which
# exists everwhere, so we don't trigger the unspecified TARGET_RELEASE error.
# We also unset TARGET_BUILD_APPS, so it doesn't interfere.
TARGET_RELEASE=trunk_staging TARGET_BUILD_APPS= $TOP/build/soong/soong_ui.bash --dumpvar-mode all_named_products | sed 's/ /\n/g'
exit $?

45
bin/list_releases Executable file
View file

@ -0,0 +1,45 @@
#!/bin/bash
# Copyright (C) 2024 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
if [[ $# -eq 1 ]]; then
# Override anything that's already set
export TARGET_PRODUCT=$1
elif [[ -z $TARGET_PRODUCT ]]; then
echo "Usage: list_releases [PRODUCT]" 1>&2
echo "" 1>&2
echo "If the optional PRODUCT parameter is bit provided, then TARGET_PRODUCT" 1>&2
echo "must have been set, for example by lunch or banchan." 1>&2
exit 1
fi
# Common script utilities
source $(cd $(dirname $BASH_SOURCE) &> /dev/null && pwd)/../../make/shell_utils.sh
require_top
# In almost call cases including get_build_var, TARGET_RELEASE is required,
# but the list of available products is not dependent on the release config
# (but note that the list of available release configs is dependent on the
# product). So for list_products, we'll just set it to trunk_staging, which
# exists everwhere, so we don't trigger the unspecified TARGET_RELEASE error.
# We also unset TARGET_BUILD_APPS, so it doesn't interfere.
TARGET_RELEASE=trunk_staging TARGET_BUILD_APPS= $TOP/build/soong/soong_ui.bash --dumpvar-mode ALL_RELEASE_CONFIGS_FOR_PRODUCT | sed 's/ /\n/g'
exit $?

20
bin/list_variants Executable file
View file

@ -0,0 +1,20 @@
#!/bin/bash
# Copyright (C) 2024 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
echo user
echo userdebug
echo eng

View file

@ -454,8 +454,8 @@ func (configs *ReleaseConfigs) WriteMakefile(outFile, targetRelease string) erro
if targetRelease != config.Name { if targetRelease != config.Name {
data += fmt.Sprintf("# User specified TARGET_RELEASE=%s\n", targetRelease) data += fmt.Sprintf("# User specified TARGET_RELEASE=%s\n", targetRelease)
} }
// The variable _all_release_configs will get deleted during processing, so do not mark it read-only. // As it stands this list is not per-product, but conceptually it is, and will be.
data += fmt.Sprintf("_all_release_configs := %s\n", strings.Join(configs.GetAllReleaseNames(), " ")) data += fmt.Sprintf("ALL_RELEASE_CONFIGS_FOR_PRODUCT :=$= %s\n", strings.Join(configs.GetAllReleaseNames(), " "))
data += fmt.Sprintf("_used_files := %s\n", strings.Join(config.GetSortedFileList(), " ")) data += fmt.Sprintf("_used_files := %s\n", strings.Join(config.GetSortedFileList(), " "))
data += fmt.Sprintf("_ALL_RELEASE_FLAGS :=$= %s\n", strings.Join(names, " ")) data += fmt.Sprintf("_ALL_RELEASE_FLAGS :=$= %s\n", strings.Join(names, " "))
for _, pName := range pNames { for _, pName := range pNames {