From d906c2df7899e999984789c6e2a2f038e08c918a Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 20 Aug 2026 20:50:52 +0900 Subject: [PATCH] DO NOT MERGE: try to fix macOS CI Assisted-by: GPT-5.6 Sol --- ci/scripts/jni_macos_build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci/scripts/jni_macos_build.sh b/ci/scripts/jni_macos_build.sh index 65ab450666..b4122dbfb9 100755 --- a/ci/scripts/jni_macos_build.sh +++ b/ci/scripts/jni_macos_build.sh @@ -77,8 +77,19 @@ cmake \ cmake --build "${build_dir}/cpp" --target install github_actions_group_end +absl_build_dir="${build_dir}/cpp/_deps/absl-build" +if [ -d "${absl_build_dir}" ]; then + github_actions_group_begin "Installing bundled Abseil" + cmake --install "${absl_build_dir}" --prefix "${install_dir}" --config Release + github_actions_group_end +fi + JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build" JAVA_JNI_CMAKE_ARGS+=" -DProtobuf_SRC_ROOT_FOLDER=${build_dir}/cpp/_deps/protobuf-src" +absl_cmake_dir="${install_dir}/lib/cmake/absl" +if [ -d "${absl_cmake_dir}" ]; then + JAVA_JNI_CMAKE_ARGS+=" -Dabsl_DIR=${absl_cmake_dir}" +fi export JAVA_JNI_CMAKE_ARGS "${source_dir}/ci/scripts/jni_build.sh" \ "${source_dir}" \