[pull] main from google:main

kokoro/docker/debian10_java11/Dockerfile

@@ -8,7 +8,7 @@
 # If you modify this container, push it to gcr.io and update our Kokoro builds
 # to reference it.
 
-FROM debian:bookworm
+FROM debian:trixie
 
 ARG DEBIAN_FRONTEND=noninteractive
 SHELL ["/bin/bash", "-c"]
@@ -42,11 +42,14 @@ ADD third_party /build/src/third_party
 
 ARG GHIDRA_INSTALL_DIR=/build/src/third_party/ghidra \
     YFILES_DIR=/build/src/third_party/java/yfiles/v2_17
-RUN cd src/third_party/zynamics/binexport/java && \
-    gradle && \
-    gradle clean && gradle --stop
-RUN cd src/third_party/zynamics/bindiff/java && \
+RUN pushd src/third_party/zynamics/binexport/java && \
+    (gradle || true) && \
     gradle clean && \
-    gradle :zylib:build :ui:obfuscatedJar && \
-    gradle clean && gradle --stop && \
+    popd && \
+    pushd src/third_party/zynamics/bindiff/java && \
+    (gradle :zylib:build :ui:obfuscatedJar || true) && \
+    gradle clean && \
+    gradle --stop && \
+    popd && \
     rm -rf /build/*
+

kokoro/macos/build.sh

@@ -43,8 +43,7 @@ cmake "${src_dir}/bindiff" \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_RULE_MESSAGES=OFF \
   "-DCMAKE_INSTALL_PREFIX=${out_dir}" \
-  -DBINEXPORT_ENABLE_BINARY_NINJA=OFF \
-  "-DBOOST_ROOT=${KOKORO_PIPER_DIR}/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost" \
+  -DBINEXPORT_ENABLE_BINARYNINJA=OFF \
   "-DIdaSdk_ROOT_DIR=${KOKORO_PIPER_DIR}/google3/third_party/idasdk"
 cmake --build . --config Release -- "-j$(sysctl -n hw.logicalcpu)"
 ctest --build-config Release --output-on-failure -R '^[A-Z]'

kokoro/ubuntu/build.sh

@@ -23,7 +23,6 @@ docker run \
   -e "KOKORO_PIPER_CHANGELIST=${KOKORO_PIPER_CHANGELIST}" \
   -v "${KOKORO_ARTIFACTS_DIR}/git/binexport":/build/deps/binexport \
   -v "${KOKORO_PIPER_DIR}/google3/third_party/idasdk":/build/deps/idasdk \
-  -v "${KOKORO_PIPER_DIR}/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost":/build/deps/boost \
   -v "${KOKORO_ARTIFACTS_DIR}/git/absl":/build/out/_deps/absl-src \
   -v "${KOKORO_ARTIFACTS_DIR}/git/googletest":/build/out/_deps/googletest-src \
   -v "${KOKORO_ARTIFACTS_DIR}/git/protobuf":/build/out/_deps/protobuf-src \

kokoro/ubuntu/dockerized_build.sh

@@ -15,7 +15,6 @@ cmake "${src_dir}/bindiff/" \
   -DFETCHCONTENT_FULLY_DISCONNECTED=ON \
   -DCMAKE_BUILD_TYPE=Release \
   "-DCMAKE_INSTALL_PREFIX=${out_dir}" \
-  "-DBOOST_ROOT=${deps_dir}/boost" \
   "-DIdaSdk_ROOT_DIR=${deps_dir}/idasdk"
 cmake --build . --config Release
 ctest --build-config Release --output-on-failure -R '^[A-Z]'

kokoro/windows/build.bat

@@ -15,11 +15,6 @@ set SRC_DIR=%KOKORO_ARTIFACTS_DIR%/git
 set OUT_DIR=%BUILD_DIR%
 set DEPS_DIR=%BUILD_DIR%
 
-:: Copy extra Binary Ninja API dependency
-xcopy /q /s /e ^
-  "%KOKORO_PIPER_DIR%\google3\third_party\jsoncpp" ^
-  "%KOKORO_PIPER_DIR%\google3\third_party\binaryninja_api\third_party\jsoncpp\"
-
 :: Set up Visual Studio
 call C:\VS\VC\Auxiliary\Build\vcvarsall.bat x64
 
@@ -30,11 +25,10 @@ cmake "%SRC_DIR%/bindiff" ^
   "-DFETCHCONTENT_SOURCE_DIR_ABSL=%KOKORO_ARTIFACTS_DIR%\git\absl" ^
   "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=%KOKORO_ARTIFACTS_DIR%\git\googletest" ^
   "-DFETCHCONTENT_SOURCE_DIR_PROTOBUF=%KOKORO_ARTIFACTS_DIR%\git\protobuf" ^
-  "-DFETCHCONTENT_SOURCE_DIR_BINARYNINJAAPI=%KOKORO_PIPER_DIR%\google3\third_party\binaryninja_api" ^
   "-DFETCHCONTENT_SOURCE_DIR_SQLITE=%KOKORO_PIPER_DIR%\google3\third_party\sqlite\src" ^
   -DCMAKE_BUILD_TYPE=Release ^
   "-DCMAKE_INSTALL_PREFIX=%OUT_DIR%" ^
-  "-DBOOST_ROOT=%KOKORO_PIPER_DIR%\google3\third_party\boost\do_not_include_from_google3_only_third_party\boost" ^
+  -DBINEXPORT_ENABLE_BINARYNINJA=OFF ^
   "-DIdaSdk_ROOT_DIR=%KOKORO_PIPER_DIR%\google3\third_party\idasdk" ^
   -DBUILD_TESTING=OFF || exit /b
 cmake --build . --config Release || exit /b