From 335dddb292dc806e097582cb6840b573b33b9f26 Mon Sep 17 00:00:00 2001 From: ckl Date: Thu, 2 May 2019 13:57:08 -0700 Subject: [PATCH] Fix for compatibility with bazel 0.25. In bazel 0.25 the flag --incompatible_no_transitive_loads is now enabled by default. To fix this, we must not rely on imported symbols being exported by default. Context: https://github.com/bazelbuild/bazel/issues/5636 PiperOrigin-RevId: 246384617 GitOrigin-RevId: 5b911dcb631637cadc42d83597955058d5987556 --- kokoro/run_tests.sh | 2 +- third_party/rules_protobuf/protobuf/rules.bzl | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh index 13f66b7b5e..6517072edd 100755 --- a/kokoro/run_tests.sh +++ b/kokoro/run_tests.sh @@ -52,7 +52,7 @@ readonly DISABLE_SANDBOX_ARGS if ! [ -z "${KOKORO_ROOT}" ]; then rm -f ~/.bazelrc # Install the latest version of Bazel. - use_bazel.sh 0.24.1 + use_bazel.sh latest if [[ "$PLATFORM" == 'darwin' ]]; then export DEVELOPER_DIR="/Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer" export ANDROID_HOME="/Users/kbuilder/Library/Android/sdk" diff --git a/third_party/rules_protobuf/protobuf/rules.bzl b/third_party/rules_protobuf/protobuf/rules.bzl index 80f6f72e70..ecaaf192b5 100644 --- a/third_party/rules_protobuf/protobuf/rules.bzl +++ b/third_party/rules_protobuf/protobuf/rules.bzl @@ -2,5 +2,16 @@ """ -load("//third_party/rules_protobuf/protobuf:internal/proto_compile.bzl", "proto_compile") -load("//third_party/rules_protobuf/protobuf:internal/proto_language.bzl", "proto_language", "proto_language_deps") +load( + "//third_party/rules_protobuf/protobuf:internal/proto_compile.bzl", + _proto_compile = "proto_compile", +) +load( + "//third_party/rules_protobuf/protobuf:internal/proto_language.bzl", + _proto_language = "proto_language", + _proto_language_deps = "proto_language_deps", +) + +proto_compile = _proto_compile +proto_language = _proto_language +proto_language_deps = _proto_language_deps