Skip to content
This repository has been archived by the owner on Apr 17, 2024. It is now read-only.

Commit

Permalink
Fix for compatibility with bazel 0.25.
Browse files Browse the repository at this point in the history
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
GitOrigin-RevId: 5b911dcb631637cadc42d83597955058d5987556
  • Loading branch information
chuckx committed May 3, 2019
1 parent 38e29aa commit 335dddb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion kokoro/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 13 additions & 2 deletions third_party/rules_protobuf/protobuf/rules.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 335dddb

Please sign in to comment.