Merge branch 'google:master' into gemini-cli-fixes

reconsumeralization · web-flow · commit aa9dc4067455 · 2025-09-05T10:01:28.000-04:00
diff --git a/infra/experimental/chronos/manager.py b/infra/experimental/chronos/manager.py
@@ -619,7 +619,7 @@ def main():
       check_test(project, args.sanitizer, args.container_output,
                  args.run_full_cache_replay)
   if args.command == 'check-replay-script':
-    check_cached_replay(args.project, args.sanitizer, args.container_output)
+    check_cached_replay(args.project, args.sanitizer)
   if args.command == 'build-cached-image':
     build_cached_project(args.project,
                          sanitizer=args.sanitizer,
diff --git a/projects/rtpproxy/build.sh b/projects/rtpproxy/build.sh
@@ -15,4 +15,9 @@
 #
 ################################################################################
 
+# TODO(David): move this patch upstream
+if [ -f /usr/local/bin/clang-21 ]; then
+  echo "Adjusting clang version"
+  sed -i 's/CLANG_VER=18/CLANG_VER=21/g' ./scripts/fuzz/oss-fuzz-build.sh
+fi
 bash -x ./scripts/fuzz/oss-fuzz-build.sh

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,9 @@`
`15`	`15`	`#`
`16`	`16`	`################################################################################`
`17`	`17`
	`18`	`+# TODO(David): move this patch upstream`
	`19`	`+if [ -f /usr/local/bin/clang-21 ]; then`
	`20`	`+ echo "Adjusting clang version"`
	`21`	`+ sed -i 's/CLANG_VER=18/CLANG_VER=21/g' ./scripts/fuzz/oss-fuzz-build.sh`
	`22`	`+fi`
`18`	`23`	`bash -x ./scripts/fuzz/oss-fuzz-build.sh`