Upgrade to protobuf 33.1

Author: kannanjgithub

buildscripts/kokoro/windows32.bat

@@ -25,7 +25,7 @@ cd "%WORKSPACE%"
 
 SET TARGET_ARCH=x86_32
 SET FAIL_ON_WARNINGS=true
-SET PROTOBUF_VER=26.1
+SET PROTOBUF_VER=33.1
 SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig
 SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib
 SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include
@@ -66,14 +66,16 @@ for /f "tokens=*" %%a in ('pkg-config --libs protobuf') do (
       set lib=!lib:~2!
       @rem remove spaces
       set lib=!lib: =!
-      @rem Because protobuf is specified as libprotobuf and elsewhere
-      if !lib! NEQ protobuf (
+      set libprefix=!lib:~0,4!
+      if !libprefix!==absl (
         set lib=!lib!.lib
-        if "!libs_list!"=="" (
-          set libs_list=!lib!
-        ) else (
-          set libs_list=!libs_list!,!lib!
-        )
+      ) else (
+        set lib=lib!lib!.lib
+      )
+      if "!libs_list!"=="" (
+        set libs_list=!lib!
+      ) else (
+        set libs_list=!libs_list!,!lib!
       )
     )
   )

buildscripts/kokoro/windows64.bat

@@ -24,7 +24,7 @@ cd "%WORKSPACE%"
 
 SET TARGET_ARCH=x86_64
 SET FAIL_ON_WARNINGS=true
-SET PROTOBUF_VER=26.1
+SET PROTOBUF_VER=33.1
 SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib\\pkgconfig
 SET VC_PROTOBUF_LIBS=/LIBPATH:%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\lib
 SET VC_PROTOBUF_INCLUDE=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\\build\\protobuf-%PROTOBUF_VER%\\include
@@ -50,14 +50,16 @@ for /f "tokens=*" %%a in ('pkg-config --libs protobuf') do (
       set lib=!lib:~2!
       @rem remove spaces
       set lib=!lib: =!
-      @rem Because protobuf is specified as libprotobuf and elsewhere
-      if !lib! NEQ protobuf (
+      set libprefix=!lib:~0,4!
+      if !libprefix!==absl (
         set lib=!lib!.lib
-        if "!libs_list!"=="" (
-          set libs_list=!lib!
-        ) else (
-          set libs_list=!libs_list!,!lib!
-        )
+      ) else (
+        set lib=lib!lib!.lib
+      )
+      if "!libs_list!"=="" (
+        set libs_list=!lib!
+      ) else (
+        set libs_list=!libs_list!,!lib!
       )
     )
   )

buildscripts/make_dependencies.bat

@@ -1,7 +1,7 @@
 choco install -y pkgconfiglite
 choco install -y openjdk --version=17.0
 set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin"
-set PROTOBUF_VER=26.1
+set PROTOBUF_VER=33.1
 set ABSL_VERSION=20250127.1
 set CMAKE_NAME=cmake-3.26.3-windows-x86_64
 

buildscripts/make_dependencies.sh

@@ -3,7 +3,7 @@
 # Build protoc
 set -evux -o pipefail
 
-PROTOBUF_VERSION=26.1
+PROTOBUF_VERSION=33.1
 ABSL_VERSION=20250127.1
 CMAKE_VERSION=3.26.3