Snap for 9170954 from f6c29aa6c96510a7e88642117177aebaf8a31586 to qt-aml-tzdata-releaseq_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001android10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I5dffe19a3059bdf856af1fe99c9918f859a12224

3 files changed, 22 insertions, 8 deletions

diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go
index d416d54a3..a7f92602b 100644
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@@ -53,12 +53,23 @@ func inList(s string, list []string) bool {
 	return indexList(s, list) != -1
 }
 
-func loadEnvConfig() error {
+func loadEnvConfig(config build.Config) 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))
+	configDirs := []string{
+		os.Getenv("ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR"),
+		config.OutDir(),
+		configDir,
+	}
+	var cfgFile string
+	for _, dir := range configDirs {
+		cfgFile = filepath.Join(os.Getenv("TOP"), dir, fmt.Sprintf("%s.%s", bc, jsonSuffix))
+		if _, err := os.Stat(cfgFile); err == nil {
+			break
+		}
+	}
 
 	envVarsJSON, err := ioutil.ReadFile(cfgFile)
 	if err != nil {
@@ -74,9 +85,7 @@ func loadEnvConfig() error {
 		if os.Getenv(k) != "" {
 			continue
 		}
-		if err := os.Setenv(k, v); err != nil {
-			return err
-		}
+		config.Environment().Set(k, v)
 	}
 	return nil
 }
@@ -148,12 +157,11 @@ func main() {
 		config = build.NewConfig(buildCtx, os.Args[1:]...)
 	}
 
-	if err := loadEnvConfig(); err != nil {
+	if err := loadEnvConfig(config); err != nil {
 		fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err)
 		os.Exit(1)
 	}
 
-
 	build.SetupOutDir(buildCtx, config)
 
 	logsDir := config.OutDir()
diff --git a/ui/build/config.go b/ui/build/config.go
index 28ce57d04..46a12fd34 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -616,7 +616,12 @@ func (c *configImpl) rbeReproxy() string {
 }
 
 func (c *configImpl) rbeAuth() (string, string) {
-	credFlags := []string{"use_application_default_credentials", "use_gce_credentials", "credential_file"}
+	credFlags := []string{
+		"use_application_default_credentials",
+		"use_gce_credentials",
+		"credential_file",
+		"use_google_prod_creds",
+	}
 	for _, cf := range credFlags {
 		for _, f := range []string{"RBE_" + cf, "FLAG_" + cf} {
 			if v, ok := c.environ.Get(f); ok {
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index f4bb89fbb..1b6ec4f4d 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -102,6 +102,7 @@ var Configuration = map[string]PathConfig{
 	"rsync":    Allowed,
 	"sed":      Allowed,
 	"sh":       Allowed,
+	"stubby":   Allowed,
 	"tar":      Allowed,
 	"timeout":  Allowed,
 	"tr":       Allowed,