Merge "Load RBE related env vars from config files"
This commit is contained in:
@@ -16,6 +16,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
@@ -34,6 +35,11 @@ import (
|
|||||||
"android/soong/ui/tracer"
|
"android/soong/ui/tracer"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
configDir = "vendor/google/tools/soong_config"
|
||||||
|
jsonSuffix = "json"
|
||||||
|
)
|
||||||
|
|
||||||
// A command represents an operation to be executed in the soong build
|
// A command represents an operation to be executed in the soong build
|
||||||
// system.
|
// system.
|
||||||
type command struct {
|
type command struct {
|
||||||
@@ -110,6 +116,34 @@ func inList(s string, list []string) bool {
|
|||||||
return indexList(s, list) != -1
|
return indexList(s, list) != -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func loadEnvConfig() error {
|
||||||
|
bc := os.Getenv("ANDROID_BUILD_ENVIRONMENT_CONFIG")
|
||||||
|
if bc == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
cfgFile := filepath.Join(os.Getenv("TOP"), configDir, fmt.Sprintf("%s.%s", bc, jsonSuffix))
|
||||||
|
|
||||||
|
envVarsJSON, err := ioutil.ReadFile(cfgFile)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "\033[33mWARNING:\033[0m failed to open config file %s: %s\n", cfgFile, err.Error())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var envVars map[string]map[string]string
|
||||||
|
if err := json.Unmarshal(envVarsJSON, &envVars); err != nil {
|
||||||
|
return fmt.Errorf("env vars config file: %s did not parse correctly: %s", cfgFile, err.Error())
|
||||||
|
}
|
||||||
|
for k, v := range envVars["env"] {
|
||||||
|
if os.Getenv(k) != "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := os.Setenv(k, v); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// Main execution of soong_ui. The command format is as follows:
|
// Main execution of soong_ui. The command format is as follows:
|
||||||
//
|
//
|
||||||
// soong_ui <command> [<arg 1> <arg 2> ... <arg n>]
|
// soong_ui <command> [<arg 1> <arg 2> ... <arg n>]
|
||||||
@@ -171,6 +205,11 @@ func main() {
|
|||||||
Status: stat,
|
Status: stat,
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
if err := loadEnvConfig(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
config := c.config(buildCtx, args...)
|
config := c.config(buildCtx, args...)
|
||||||
|
|
||||||
build.SetupOutDir(buildCtx, config)
|
build.SetupOutDir(buildCtx, config)
|
||||||
|
Reference in New Issue
Block a user