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: bazelbuild/bazel#5636 PiperOrigin-RevId: 246384617
tink-crypto · May 10, 2019 · 0c0d11f · 0c0d11f
1 parent b1fabbf
commit 0c0d11f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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