Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5dee2a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add google_prod_creds to the list of auth mechanisms" am: ca8e93e7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2031424

Change-Id: I82ec0a4d577645f3e377cc5534c8093e4d7345db
parents 41b4e249 ca8e93e7
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ func loadEnvConfig(ctx Context, config *configImpl) error {
	}

	if err := fetchEnvConfig(ctx, config, bc); err != nil {
		fmt.Fprintf(os.Stderr, "Failed to fetch config file: %v", err)
		fmt.Fprintf(os.Stderr, "Failed to fetch config file: %v\n", err)
	}

	configDirs := []string{
@@ -1191,7 +1191,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 {