apt-get update before install pkg-config.

Author: kannanjgithub

buildscripts/kokoro/android.sh

@@ -33,7 +33,7 @@ mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/
 curl -Ls https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz | \
     tar xz -C /tmp
 export PATH=/tmp/cmake-3.26.3-linux-x86_64/bin:$PATH
-sudo apt-get install pkg-config
+sudo apt-get update && sudo apt-get install pkg-config
 
 # Proto deps
 buildscripts/make_dependencies.sh

buildscripts/make_dependencies.bat

@@ -39,10 +39,11 @@ mkdir protobuf-%PROTOBUF_VER%\build
 pushd protobuf-%PROTOBUF_VER%\build
 
 @rem cmake does not detect x86_64 from the vcvars64.bat variables.
-@rem If vcvars64.bat has set PLATFORM to X64, then inform cmake to use the Win64 version of VS
+@rem If vcvars64.bat has set PLATFORM to X64, then inform cmake to use the Win64 version of VS, likewise for x32
 if "%PLATFORM%" == "x64" (
-  @rem Note the space
   SET CMAKE_VSARCH=-A x64
+) else if "%PLATFORM%" == "x32" (
+  SET CMAKE_VSARCH=-A x32
 ) else (
   SET CMAKE_VSARCH=
 )
@@ -53,7 +54,7 @@ for /f "tokens=1 delims=." %%a in ("%VisualStudioVersion%") do (
   SET visual_studio_major_version=%%a
 )
 cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=%cd%\protobuf-%PROTOBUF_VER% -DCMAKE_PREFIX_PATH=%cd%\protobuf-%PROTOBUF_VER% -G "Visual Studio %visual_studio_major_version% %VC_YEAR%" %CMAKE_VSARCH% ..
-cmake --build . --config Release --target install 
+cmake --build . --config Release --target install
 popd
 goto :eof