From e7d9cccf9ac816d2b54b48a0f3d82552f47e41a5 Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Fri, 5 Mar 2021 14:00:32 -0800
Subject: [PATCH] Fix build abseil/boringssl/protobuf at head (#25638)

* Update PyYAML install steps

* F-string is 3.6+

* Regenerate project
---
 CMakeLists.txt                      | 1 -
 tools/buildgen/generate_projects.py | 2 +-
 tools/buildgen/generate_projects.sh | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca95319c30..04b2848f4f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13782,7 +13782,6 @@ target_include_directories(rbac_translator_test
     ${_gRPC_UPB_GENERATED_DIR}
     ${_gRPC_UPB_GRPC_GENERATED_DIR}
     ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
     ${_gRPC_ZLIB_INCLUDE_DIR}
     third_party/googletest/googletest/include
     third_party/googletest/googletest
diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py
index 484ba7ca93a..2e64484f08e 100755
--- a/tools/buildgen/generate_projects.py
+++ b/tools/buildgen/generate_projects.py
@@ -126,7 +126,7 @@ def main() -> None:
     err_cnt, _ = jobset.run(generate_template_render_jobs(templates),
                             maxjobs=args.jobs)
     if err_cnt != 0:
-        print(f'ERROR: {err_cnt} error(s) found while generating projects.',
+        print('ERROR: %s error(s) found while generating projects.' % err_cnt,
               file=sys.stderr)
         sys.exit(1)
 
diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh
index 20d615639da..b98be3ba00a 100755
--- a/tools/buildgen/generate_projects.sh
+++ b/tools/buildgen/generate_projects.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/bash
 # Copyright 2015 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,9 @@ export TEST=${TEST:-false}
 YAML_OK=$(python3 -c "import yaml; print(yaml.__version__.split('.') >= ['5', '4', '1'])")
 
 if [[ "${YAML_OK}" != "True" ]]; then
-  python3 -m pip install --upgrade --ignore-installed PyYAML==5.4.1 --user
+  # PyYAML dropped 3.5 support at 5.4.1, which makes 5.3.1 the latest version we
+  # can use.
+  python3 -m pip install --upgrade --ignore-installed PyYAML==5.3.1 --user
 fi
 
 echo "Generating build_autogenerated.yaml from bazel BUILD file"