Merge changes I4c38860c,I2bdc8876 into main
* changes: release_config: various cleanup Support release configs with only aconfig flags
This commit is contained in:
Treehugger Robot
Gerrit Code Review
commit
6ab1b1fd03
8 changed files with 286 additions and 81 deletions
28
bin/build-flag
Executable file
28
bin/build-flag
Executable file
|
|
@ -0,0 +1,28 @@
|
|||
#!/bin/bash -eu
|
||||
#
|
||||
# Copyright 2017 Google Inc. All rights reserved.
|
||||
#
|
||||
# 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.
|
||||
|
||||
source $(cd $(dirname $BASH_SOURCE) &> /dev/null && pwd)/../../make/shell_utils.sh
|
||||
require_top
|
||||
|
||||
# Save the current PWD for use in soong_ui
|
||||
export ORIGINAL_PWD=${PWD}
|
||||
export TOP=$(gettop)
|
||||
source ${TOP}/build/soong/scripts/microfactory.bash
|
||||
|
||||
soong_build_go build-flag android/soong/cmd/release_config/build_flag
|
||||
|
||||
cd ${TOP}
|
||||
exec "$(getoutdir)/build-flag" "$@"
|
||||
|
|
@ -1,10 +1,12 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"cmp"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
rc_lib "android/soong/cmd/release_config/release_config_lib"
|
||||
|
|
@ -36,6 +38,16 @@ type Flags struct {
|
|||
|
||||
// Disable warning messages
|
||||
quiet bool
|
||||
|
||||
// Show all release configs
|
||||
allReleases bool
|
||||
|
||||
// Call get_build_var PRODUCT_RELEASE_CONFIG_MAPS to get the
|
||||
// product-specific map directories.
|
||||
useGetBuildVar bool
|
||||
|
||||
// Panic on errors.
|
||||
debug bool
|
||||
}
|
||||
|
||||
type CommandFunc func(*rc_lib.ReleaseConfigs, Flags, string, []string) error
|
||||
|
|
@ -60,6 +72,14 @@ func GetMapDir(path string) (string, error) {
|
|||
return "", fmt.Errorf("Could not determine directory from %s", path)
|
||||
}
|
||||
|
||||
func MarshalFlagDefaultValue(config *rc_lib.ReleaseConfig, name string) (ret string, err error) {
|
||||
fa, ok := config.FlagArtifacts[name]
|
||||
if !ok {
|
||||
return "", fmt.Errorf("%s not found in %s", name, config.Name)
|
||||
}
|
||||
return rc_lib.MarshalValue(fa.Traces[0].Value), nil
|
||||
}
|
||||
|
||||
func MarshalFlagValue(config *rc_lib.ReleaseConfig, name string) (ret string, err error) {
|
||||
fa, ok := config.FlagArtifacts[name]
|
||||
if !ok {
|
||||
|
|
@ -68,19 +88,41 @@ func MarshalFlagValue(config *rc_lib.ReleaseConfig, name string) (ret string, er
|
|||
return rc_lib.MarshalValue(fa.Value), nil
|
||||
}
|
||||
|
||||
// Returns a list of ReleaseConfig objects for which to process flags.
|
||||
func GetReleaseArgs(configs *rc_lib.ReleaseConfigs, commonFlags Flags) ([]*rc_lib.ReleaseConfig, error) {
|
||||
var all bool
|
||||
relFlags := flag.NewFlagSet("set", flag.ExitOnError)
|
||||
relFlags.BoolVar(&all, "all", false, "Display all flags")
|
||||
relFlags := flag.NewFlagSet("releaseFlags", flag.ExitOnError)
|
||||
relFlags.BoolVar(&all, "all", false, "Display all releases")
|
||||
relFlags.Parse(commonFlags.targetReleases)
|
||||
var ret []*rc_lib.ReleaseConfig
|
||||
if all {
|
||||
if all || commonFlags.allReleases {
|
||||
sortMap := map[string]int{
|
||||
"trunk_staging": 0,
|
||||
"trunk_food": 10,
|
||||
"trunk": 20,
|
||||
// Anything not listed above, uses this for key 1 in the sort.
|
||||
"-default": 100,
|
||||
}
|
||||
|
||||
for _, config := range configs.ReleaseConfigs {
|
||||
ret = append(ret, config)
|
||||
}
|
||||
slices.SortFunc(ret, func(a, b *rc_lib.ReleaseConfig) int {
|
||||
mapValue := func(v *rc_lib.ReleaseConfig) int {
|
||||
if v, ok := sortMap[v.Name]; ok {
|
||||
return v
|
||||
}
|
||||
return sortMap["-default"]
|
||||
}
|
||||
if n := cmp.Compare(mapValue(a), mapValue(b)); n != 0 {
|
||||
return n
|
||||
}
|
||||
return cmp.Compare(a.Name, b.Name)
|
||||
})
|
||||
return ret, nil
|
||||
}
|
||||
for _, arg := range relFlags.Args() {
|
||||
// Return releases in the order that they were given.
|
||||
config, err := configs.GetReleaseConfig(arg)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -92,12 +134,17 @@ func GetReleaseArgs(configs *rc_lib.ReleaseConfigs, commonFlags Flags) ([]*rc_li
|
|||
|
||||
func GetCommand(configs *rc_lib.ReleaseConfigs, commonFlags Flags, cmd string, args []string) error {
|
||||
isTrace := cmd == "trace"
|
||||
isSet := cmd == "set"
|
||||
|
||||
var all bool
|
||||
getFlags := flag.NewFlagSet("set", flag.ExitOnError)
|
||||
getFlags := flag.NewFlagSet("get", flag.ExitOnError)
|
||||
getFlags.BoolVar(&all, "all", false, "Display all flags")
|
||||
getFlags.Parse(args)
|
||||
args = getFlags.Args()
|
||||
|
||||
if isSet {
|
||||
commonFlags.allReleases = true
|
||||
}
|
||||
releaseConfigList, err := GetReleaseArgs(configs, commonFlags)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -113,21 +160,72 @@ func GetCommand(configs *rc_lib.ReleaseConfigs, commonFlags Flags, cmd string, a
|
|||
}
|
||||
}
|
||||
|
||||
showName := len(releaseConfigList) > 1 || len(args) > 1
|
||||
for _, config := range releaseConfigList {
|
||||
var configName string
|
||||
if len(releaseConfigList) > 1 {
|
||||
configName = fmt.Sprintf("%s.", config.Name)
|
||||
}
|
||||
var maxVariableNameLen, maxReleaseNameLen int
|
||||
var releaseNameFormat, variableNameFormat string
|
||||
valueFormat := "%s"
|
||||
showReleaseName := len(releaseConfigList) > 1
|
||||
showVariableName := len(args) > 1
|
||||
if showVariableName {
|
||||
for _, arg := range args {
|
||||
val, err := MarshalFlagValue(config, arg)
|
||||
if err != nil {
|
||||
return err
|
||||
maxVariableNameLen = max(len(arg), maxVariableNameLen)
|
||||
}
|
||||
variableNameFormat = fmt.Sprintf("%%-%ds ", maxVariableNameLen)
|
||||
valueFormat = "'%s'"
|
||||
}
|
||||
if showReleaseName {
|
||||
for _, config := range releaseConfigList {
|
||||
maxReleaseNameLen = max(len(config.Name), maxReleaseNameLen)
|
||||
}
|
||||
releaseNameFormat = fmt.Sprintf("%%-%ds ", maxReleaseNameLen)
|
||||
valueFormat = "'%s'"
|
||||
}
|
||||
|
||||
outputOneLine := func(variable, release, value, valueFormat string) {
|
||||
var outStr string
|
||||
if showVariableName {
|
||||
outStr += fmt.Sprintf(variableNameFormat, variable)
|
||||
}
|
||||
if showReleaseName {
|
||||
outStr += fmt.Sprintf(releaseNameFormat, release)
|
||||
}
|
||||
outStr += fmt.Sprintf(valueFormat, value)
|
||||
fmt.Println(outStr)
|
||||
}
|
||||
|
||||
for _, arg := range args {
|
||||
if _, ok := configs.FlagArtifacts[arg]; !ok {
|
||||
return fmt.Errorf("%s is not a defined build flag", arg)
|
||||
}
|
||||
}
|
||||
|
||||
for _, arg := range args {
|
||||
for _, config := range releaseConfigList {
|
||||
if isSet {
|
||||
// If this is from the set command, format the output as:
|
||||
// <default> ""
|
||||
// trunk_staging ""
|
||||
// trunk ""
|
||||
//
|
||||
// ap1a ""
|
||||
// ...
|
||||
switch {
|
||||
case config.Name == "trunk_staging":
|
||||
defaultValue, err := MarshalFlagDefaultValue(config, arg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
outputOneLine(arg, "<default>", defaultValue, valueFormat)
|
||||
case config.AconfigFlagsOnly:
|
||||
continue
|
||||
case config.Name == "trunk":
|
||||
fmt.Println()
|
||||
}
|
||||
}
|
||||
if showName {
|
||||
fmt.Printf("%s%s=%s\n", configName, arg, val)
|
||||
val, err := MarshalFlagValue(config, arg)
|
||||
if err == nil {
|
||||
outputOneLine(arg, config.Name, val, valueFormat)
|
||||
} else {
|
||||
fmt.Printf("%s\n", val)
|
||||
outputOneLine(arg, config.Name, "REDACTED", "%s")
|
||||
}
|
||||
if isTrace {
|
||||
for _, trace := range config.FlagArtifacts[arg].Traces {
|
||||
|
|
@ -160,6 +258,9 @@ func SetCommand(configs *rc_lib.ReleaseConfigs, commonFlags Flags, cmd string, a
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if release.AconfigFlagsOnly {
|
||||
return fmt.Errorf("%s does not allow build flag overrides", targetRelease)
|
||||
}
|
||||
flagArtifact, ok := release.FlagArtifacts[name]
|
||||
if !ok {
|
||||
return fmt.Errorf("Unknown build flag %s", name)
|
||||
|
|
@ -177,28 +278,48 @@ func SetCommand(configs *rc_lib.ReleaseConfigs, commonFlags Flags, cmd string, a
|
|||
Value: rc_lib.UnmarshalValue(value),
|
||||
}
|
||||
flagPath := filepath.Join(valueDir, "flag_values", targetRelease, fmt.Sprintf("%s.textproto", name))
|
||||
return rc_lib.WriteMessage(flagPath, flagValue)
|
||||
err = rc_lib.WriteMessage(flagPath, flagValue)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Reload the release configs.
|
||||
configs, err = rc_lib.ReadReleaseConfigMaps(commonFlags.maps, commonFlags.targetReleases[0], commonFlags.useGetBuildVar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = GetCommand(configs, commonFlags, cmd, args[0:1])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Printf("Updated: %s\n", flagPath)
|
||||
return nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
var err error
|
||||
var commonFlags Flags
|
||||
var configs *rc_lib.ReleaseConfigs
|
||||
var useBuildVar bool
|
||||
topDir, err := rc_lib.GetTopDir()
|
||||
|
||||
outEnv := os.Getenv("OUT_DIR")
|
||||
if outEnv == "" {
|
||||
outEnv = "out"
|
||||
}
|
||||
// Handle the common arguments
|
||||
flag.StringVar(&commonFlags.top, "top", ".", "path to top of workspace")
|
||||
flag.StringVar(&commonFlags.top, "top", topDir, "path to top of workspace")
|
||||
flag.BoolVar(&commonFlags.quiet, "quiet", false, "disable warning messages")
|
||||
flag.Var(&commonFlags.maps, "map", "path to a release_config_map.textproto. may be repeated")
|
||||
flag.StringVar(&commonFlags.outDir, "out_dir", rc_lib.GetDefaultOutDir(), "basepath for the output. Multiple formats are created")
|
||||
flag.StringVar(&commonFlags.outDir, "out-dir", rc_lib.GetDefaultOutDir(), "basepath for the output. Multiple formats are created")
|
||||
flag.Var(&commonFlags.targetReleases, "release", "TARGET_RELEASE for this build")
|
||||
flag.BoolVar(&useBuildVar, "use_get_build_var", true, "use get_build_var PRODUCT_RELEASE_CONFIG_MAPS")
|
||||
flag.BoolVar(&commonFlags.allReleases, "all-releases", false, "operate on all releases. (Ignored for set command)")
|
||||
flag.BoolVar(&commonFlags.useGetBuildVar, "use-get-build-var", true, "use get_build_var PRODUCT_RELEASE_CONFIG_MAPS to get needed maps")
|
||||
flag.BoolVar(&commonFlags.debug, "debug", false, "turn on debugging output for errors")
|
||||
flag.Parse()
|
||||
|
||||
errorExit := func(err error) {
|
||||
if commonFlags.debug {
|
||||
panic(err)
|
||||
}
|
||||
fmt.Fprintf(os.Stderr, "%s\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if commonFlags.quiet {
|
||||
rc_lib.DisableWarnings()
|
||||
}
|
||||
|
|
@ -208,24 +329,23 @@ func main() {
|
|||
}
|
||||
|
||||
if err = os.Chdir(commonFlags.top); err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
|
||||
// Get the current state of flagging.
|
||||
relName := commonFlags.targetReleases[0]
|
||||
if relName == "--all" || relName == "-all" {
|
||||
// If the users said `--release --all`, grab trunk staging for simplicity.
|
||||
relName = "trunk_staging"
|
||||
commonFlags.allReleases = true
|
||||
}
|
||||
configs, err = rc_lib.ReadReleaseConfigMaps(commonFlags.maps, relName, true)
|
||||
configs, err = rc_lib.ReadReleaseConfigMaps(commonFlags.maps, relName, commonFlags.useGetBuildVar)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
|
||||
if cmd, ok := commandMap[flag.Arg(0)]; ok {
|
||||
args := flag.Args()
|
||||
if err = cmd(configs, commonFlags, args[0], args[1:]); err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,18 +15,29 @@ import (
|
|||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
// When a flag declaration has an initial value that is a string, the default workflow is PREBUILT.
|
||||
// If the flag name starts with any of prefixes in manualFlagNamePrefixes, it is MANUAL.
|
||||
var manualFlagNamePrefixes []string = []string{
|
||||
"RELEASE_ACONFIG_",
|
||||
"RELEASE_PLATFORM_",
|
||||
}
|
||||
var (
|
||||
// When a flag declaration has an initial value that is a string, the default workflow is PREBUILT.
|
||||
// If the flag name starts with any of prefixes in manualFlagNamePrefixes, it is MANUAL.
|
||||
manualFlagNamePrefixes []string = []string{
|
||||
"RELEASE_ACONFIG_",
|
||||
"RELEASE_PLATFORM_",
|
||||
}
|
||||
|
||||
var defaultFlagNamespace string = "android_UNKNOWN"
|
||||
// Set `aconfig_flags_only: true` in these release configs.
|
||||
aconfigFlagsOnlyConfigs map[string]bool = map[string]bool{
|
||||
"trunk_food": true,
|
||||
}
|
||||
|
||||
// Default namespace value. This is intentionally invalid.
|
||||
defaultFlagNamespace string = "android_UNKNOWN"
|
||||
|
||||
// What is the current name for "next".
|
||||
nextName string = "ap3a"
|
||||
)
|
||||
|
||||
func RenameNext(name string) string {
|
||||
if name == "next" {
|
||||
return "ap3a"
|
||||
return nextName
|
||||
}
|
||||
return name
|
||||
}
|
||||
|
|
@ -205,6 +216,9 @@ func ProcessBuildConfigs(dir, name string, paths []string, releaseProto *rc_prot
|
|||
fmt.Printf("%s: Unexpected value %s=%s\n", path, valName, valValue)
|
||||
}
|
||||
if flagValue != nil {
|
||||
if releaseProto.GetAconfigFlagsOnly() {
|
||||
return fmt.Errorf("%s does not allow build flag overrides", RenameNext(name))
|
||||
}
|
||||
valPath := filepath.Join(dir, "flag_values", RenameNext(name), fmt.Sprintf("%s.textproto", valName))
|
||||
err := WriteFile(valPath, flagValue)
|
||||
if err != nil {
|
||||
|
|
@ -285,6 +299,9 @@ func ProcessReleaseConfigMap(dir string, descriptionMap map[string]string) error
|
|||
releaseConfig := &rc_proto.ReleaseConfig{
|
||||
Name: proto.String(RenameNext(name)),
|
||||
}
|
||||
if aconfigFlagsOnlyConfigs[name] {
|
||||
releaseConfig.AconfigFlagsOnly = proto.Bool(true)
|
||||
}
|
||||
configFiles := config[configRegexp.SubexpIndex("files")]
|
||||
files := strings.Split(strings.ReplaceAll(configFiles, "$(local_dir)", dir+"/"), " ")
|
||||
configInherits := config[configRegexp.SubexpIndex("inherits")]
|
||||
|
|
@ -311,16 +328,26 @@ func main() {
|
|||
var dirs rc_lib.StringList
|
||||
var namespacesFile string
|
||||
var descriptionsFile string
|
||||
var debug bool
|
||||
defaultTopDir, err := rc_lib.GetTopDir()
|
||||
|
||||
flag.StringVar(&top, "top", defaultTopDir, "path to top of workspace")
|
||||
flag.Var(&dirs, "dir", "directory to process, relative to the top of the workspace")
|
||||
flag.StringVar(&namespacesFile, "namespaces", "", "location of file with 'flag_name namespace' information")
|
||||
flag.StringVar(&descriptionsFile, "descriptions", "", "location of file with 'directory description' information")
|
||||
flag.BoolVar(&debug, "debug", false, "turn on debugging output for errors")
|
||||
flag.Parse()
|
||||
|
||||
errorExit := func(err error) {
|
||||
if debug {
|
||||
panic(err)
|
||||
}
|
||||
fmt.Fprintf(os.Stderr, "%s\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if err = os.Chdir(top); err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
if len(dirs) == 0 {
|
||||
dirs = rc_lib.StringList{"build/release", "vendor/google_shared/build/release", "vendor/google/release"}
|
||||
|
|
@ -330,12 +357,12 @@ func main() {
|
|||
if namespacesFile != "" {
|
||||
data, err := os.ReadFile(namespacesFile)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
for idx, line := range strings.Split(string(data), "\n") {
|
||||
fields := strings.Split(line, " ")
|
||||
if len(fields) > 2 {
|
||||
panic(fmt.Errorf("line %d: too many fields: %s", idx, line))
|
||||
errorExit(fmt.Errorf("line %d: too many fields: %s", idx, line))
|
||||
}
|
||||
namespaceMap[fields[0]] = fields[1]
|
||||
}
|
||||
|
|
@ -347,7 +374,7 @@ func main() {
|
|||
if descriptionsFile != "" {
|
||||
data, err := os.ReadFile(descriptionsFile)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
for _, line := range strings.Split(string(data), "\n") {
|
||||
if strings.TrimSpace(line) != "" {
|
||||
|
|
@ -361,12 +388,12 @@ func main() {
|
|||
for _, dir := range dirs {
|
||||
err = ProcessBuildFlags(dir, namespaceMap)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
|
||||
err = ProcessReleaseConfigMap(dir, descriptionMap)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
errorExit(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,10 @@ type ReleaseConfig struct {
|
|||
// The names of release configs that we inherit
|
||||
InheritNames []string
|
||||
|
||||
// True if this release config only allows inheritance and aconfig flag
|
||||
// overrides. Build flag value overrides are an error.
|
||||
AconfigFlagsOnly bool
|
||||
|
||||
// Unmarshalled flag artifacts
|
||||
FlagArtifacts FlagArtifacts
|
||||
|
||||
|
|
@ -174,6 +178,9 @@ func (config *ReleaseConfig) GenerateReleaseConfig(configs *ReleaseConfigs) erro
|
|||
})
|
||||
|
||||
myDirsMap[contrib.DeclarationIndex] = true
|
||||
if config.AconfigFlagsOnly && len(contrib.FlagValues) > 0 {
|
||||
return fmt.Errorf("%s does not allow build flag overrides", config.Name)
|
||||
}
|
||||
for _, value := range contrib.FlagValues {
|
||||
name := *value.proto.Name
|
||||
fa, ok := config.FlagArtifacts[name]
|
||||
|
|
|
|||
|
|
@ -117,9 +117,12 @@ func ReleaseConfigMapFactory(protoPath string) (m *ReleaseConfigMap) {
|
|||
}
|
||||
|
||||
func (configs *ReleaseConfigs) LoadReleaseConfigMap(path string, ConfigDirIndex int) error {
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
return fmt.Errorf("%s does not exist\n", path)
|
||||
}
|
||||
m := ReleaseConfigMapFactory(path)
|
||||
if m.proto.DefaultContainers == nil {
|
||||
return fmt.Errorf("Release config map %s lacks default_container", path)
|
||||
return fmt.Errorf("Release config map %s lacks default_containers", path)
|
||||
}
|
||||
for _, container := range m.proto.DefaultContainers {
|
||||
if !validContainer(container) {
|
||||
|
|
@ -206,6 +209,9 @@ func (configs *ReleaseConfigs) LoadReleaseConfigMap(path string, ConfigDirIndex
|
|||
if err2 != nil {
|
||||
return err2
|
||||
}
|
||||
if releaseConfigContribution.proto.GetAconfigFlagsOnly() {
|
||||
config.AconfigFlagsOnly = true
|
||||
}
|
||||
m.ReleaseConfigContributions[name] = releaseConfigContribution
|
||||
config.Contributions = append(config.Contributions, releaseConfigContribution)
|
||||
return nil
|
||||
|
|
@ -376,7 +382,7 @@ func ReadReleaseConfigMaps(releaseConfigMapPaths StringList, targetRelease strin
|
|||
if len(releaseConfigMapPaths) == 0 {
|
||||
return nil, fmt.Errorf("No maps found")
|
||||
}
|
||||
fmt.Printf("No --map argument provided. Using: --map %s\n", strings.Join(releaseConfigMapPaths, " --map "))
|
||||
warnf("No --map argument provided. Using: --map %s\n", strings.Join(releaseConfigMapPaths, " --map "))
|
||||
}
|
||||
|
||||
configs := ReleaseConfigsFactory()
|
||||
|
|
@ -390,6 +396,8 @@ func ReadReleaseConfigMaps(releaseConfigMapPaths StringList, targetRelease strin
|
|||
mapsRead[configDir] = true
|
||||
configs.configDirIndexes[configDir] = idx
|
||||
configs.configDirs = append(configs.configDirs, configDir)
|
||||
// Force the path to be the textproto path, so that both the scl and textproto formats can coexist.
|
||||
releaseConfigMapPath = filepath.Join(configDir, "release_config_map.textproto")
|
||||
err = configs.LoadReleaseConfigMap(releaseConfigMapPath, idx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ func DisableWarnings() {
|
|||
|
||||
func warnf(format string, args ...any) (n int, err error) {
|
||||
if !disableWarnings {
|
||||
return fmt.Printf(format, args...)
|
||||
return fmt.Fprintf(os.Stderr, format, args...)
|
||||
}
|
||||
return 0, nil
|
||||
}
|
||||
|
|
@ -164,8 +164,8 @@ func GetTopDir() (topDir string, err error) {
|
|||
}
|
||||
|
||||
// Return the default list of map files to use.
|
||||
func GetDefaultMapPaths(queryMaps bool) (defaultLocations StringList, err error) {
|
||||
var defaultMapPaths StringList
|
||||
func GetDefaultMapPaths(queryMaps bool) (defaultMapPaths StringList, err error) {
|
||||
var defaultLocations StringList
|
||||
workingDir, err := os.Getwd()
|
||||
if err != nil {
|
||||
return
|
||||
|
|
|
|||
|
|
@ -387,6 +387,8 @@ type ReleaseConfig struct {
|
|||
// List of names of the aconfig_value_set soong module(s) for this
|
||||
// contribution.
|
||||
AconfigValueSets []string `protobuf:"bytes,3,rep,name=aconfig_value_sets,json=aconfigValueSets" json:"aconfig_value_sets,omitempty"`
|
||||
// Only aconfig flags are allowed in this release config.
|
||||
AconfigFlagsOnly *bool `protobuf:"varint,4,opt,name=aconfig_flags_only,json=aconfigFlagsOnly" json:"aconfig_flags_only,omitempty"`
|
||||
}
|
||||
|
||||
func (x *ReleaseConfig) Reset() {
|
||||
|
|
@ -442,6 +444,13 @@ func (x *ReleaseConfig) GetAconfigValueSets() []string {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (x *ReleaseConfig) GetAconfigFlagsOnly() bool {
|
||||
if x != nil && x.AconfigFlagsOnly != nil {
|
||||
return *x.AconfigFlagsOnly
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Any aliases. These are used for continuous integration builder config.
|
||||
type ReleaseAlias struct {
|
||||
state protoimpl.MessageState
|
||||
|
|
@ -609,36 +618,39 @@ var file_build_flags_src_proto_rawDesc = []byte{
|
|||
0x67, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x61, 0x63, 0x74, 0x65, 0x64,
|
||||
0x18, 0xca, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x64, 0x61, 0x63, 0x74, 0x65,
|
||||
0x64, 0x22, 0x6e, 0x0a, 0x0e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e,
|
||||
0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x68, 0x65, 0x72,
|
||||
0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x68, 0x65, 0x72,
|
||||
0x69, 0x74, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
|
||||
0x10, 0x61, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x65, 0x74,
|
||||
0x73, 0x22, 0x3b, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x6c, 0x69,
|
||||
0x61, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0xac,
|
||||
0x01, 0x0a, 0x12, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
|
||||
0x67, 0x5f, 0x6d, 0x61, 0x70, 0x12, 0x45, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73,
|
||||
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64,
|
||||
0x2e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x6c,
|
||||
0x69, 0x61, 0x73, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b,
|
||||
0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d,
|
||||
0x0a, 0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
|
||||
0x6e, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x64, 0x65, 0x66, 0x61,
|
||||
0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2a, 0x4a, 0x0a,
|
||||
0x08, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x18, 0x0a, 0x14, 0x55, 0x4e, 0x53,
|
||||
0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
|
||||
0x77, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x41, 0x55, 0x4e, 0x43, 0x48, 0x10, 0x01, 0x12,
|
||||
0x0c, 0x0a, 0x08, 0x50, 0x52, 0x45, 0x42, 0x55, 0x49, 0x4c, 0x54, 0x10, 0x02, 0x12, 0x0a, 0x0a,
|
||||
0x06, 0x4d, 0x41, 0x4e, 0x55, 0x41, 0x4c, 0x10, 0x03, 0x42, 0x33, 0x5a, 0x31, 0x61, 0x6e, 0x64,
|
||||
0x72, 0x6f, 0x69, 0x64, 0x2f, 0x73, 0x6f, 0x6f, 0x6e, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61,
|
||||
0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73,
|
||||
0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x64, 0x22, 0x9c, 0x01, 0x0a, 0x0e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f,
|
||||
0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x68, 0x65,
|
||||
0x72, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x68, 0x65,
|
||||
0x72, 0x69, 0x74, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
|
||||
0x52, 0x10, 0x61, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x65,
|
||||
0x74, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x61, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x66, 0x6c,
|
||||
0x61, 0x67, 0x73, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10,
|
||||
0x61, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x4f, 0x6e, 0x6c, 0x79,
|
||||
0x22, 0x3b, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x6c, 0x69, 0x61,
|
||||
0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0xac, 0x01,
|
||||
0x0a, 0x12, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
|
||||
0x5f, 0x6d, 0x61, 0x70, 0x12, 0x45, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18,
|
||||
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x2e,
|
||||
0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x6c, 0x69,
|
||||
0x61, 0x73, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64,
|
||||
0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a,
|
||||
0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
|
||||
0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75,
|
||||
0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2a, 0x4a, 0x0a, 0x08,
|
||||
0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x18, 0x0a, 0x14, 0x55, 0x4e, 0x53, 0x50,
|
||||
0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77,
|
||||
0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x41, 0x55, 0x4e, 0x43, 0x48, 0x10, 0x01, 0x12, 0x0c,
|
||||
0x0a, 0x08, 0x50, 0x52, 0x45, 0x42, 0x55, 0x49, 0x4c, 0x54, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06,
|
||||
0x4d, 0x41, 0x4e, 0x55, 0x41, 0x4c, 0x10, 0x03, 0x42, 0x33, 0x5a, 0x31, 0x61, 0x6e, 0x64, 0x72,
|
||||
0x6f, 0x69, 0x64, 0x2f, 0x73, 0x6f, 0x6f, 0x6e, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73,
|
||||
0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65,
|
||||
0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
}
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -119,6 +119,9 @@ message release_config {
|
|||
// List of names of the aconfig_value_set soong module(s) for this
|
||||
// contribution.
|
||||
repeated string aconfig_value_sets = 3;
|
||||
|
||||
// Only aconfig flags are allowed in this release config.
|
||||
optional bool aconfig_flags_only = 4;
|
||||
}
|
||||
|
||||
// Any aliases. These are used for continuous integration builder config.
|
||||
|
|
|
|||
Loading…
Reference in a new issue