aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKousik Kumar <kousikk@google.com>2022-06-20 22:33:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-20 22:33:39 +0000
commit3235fc567bc3a08710b8499dc98f7e04670bd5a0 (patch)
tree15dbb9c6ff9ade40bbbd0abee6a3c6f45fc31d90
parent9de3516b0a43ceca1e04922f7bcfdac7ac2c5223 (diff)
parente5eb2c429fee5a96b8b5b14fd5a0f27feeb8611d (diff)
downloadsoong-3235fc567bc3a08710b8499dc98f7e04670bd5a0.tar.gz
Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 am: e5eb2c429f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432 Change-Id: I2d434fc3ca2dc885aeb2972125b2d63d89c10ce6 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 {