aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKousik Kumar <kousikk@google.com>2022-06-20 21:17:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-20 21:17:10 +0000
commite5eb2c429fee5a96b8b5b14fd5a0f27feeb8611d (patch)
tree0c93c00a4d6c24be862af87c147b7d3ee856c3fa
parent92446e3fa627d63f7ca04f9628cd0ce0a88a94a7 (diff)
parent2fefa570f4a57a92ef0ff8d835dd41d11c3e681f (diff)
downloadsoong-e5eb2c429fee5a96b8b5b14fd5a0f27feeb8611d.tar.gz
Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432 Change-Id: I63bc86b2b4309fd8744b1f5963a5eac96d909178 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--ui/build/config.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/build/config.go b/ui/build/config.go
index 862e09f3c..56b16b18b 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -1008,7 +1008,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 {