Make transitive starlark loads explicit This fixes the build with bazel 0.25. Bug: Issue 10855 Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d (cherry picked from commit b5f1a9e2bc76fbb6091ae9438e9fb3e7156abd28)
diff --git a/WORKSPACE b/WORKSPACE index 7610ede..c013dbc 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "ca34f0cf89b2e041ea7f4aa4b9696efc2d76746f", + commit = "d710dc4d8441475fbedae2171cf3cbafe6d80f23", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl index d5764f7..c921d01 100644 --- a/tools/bzl/classpath.bzl +++ b/tools/bzl/classpath.bzl
@@ -1,4 +1,6 @@ load( "@com_googlesource_gerrit_bazlets//tools:classpath.bzl", - "classpath_collector", + _classpath_collector = "classpath_collector", ) + +classpath_collector = _classpath_collector
diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl index 3af7e58..97307bd 100644 --- a/tools/bzl/junit.bzl +++ b/tools/bzl/junit.bzl
@@ -1,4 +1,6 @@ load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", - "junit_tests", + _junit_tests = "junit_tests", ) + +junit_tests = _junit_tests
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl index 0b25d23..4d2dbdd 100644 --- a/tools/bzl/plugin.bzl +++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,10 @@ load( "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", - "PLUGIN_DEPS", - "PLUGIN_TEST_DEPS", - "gerrit_plugin", + _gerrit_plugin = "gerrit_plugin", + _plugin_deps = "PLUGIN_DEPS", + _plugin_test_deps = "PLUGIN_TEST_DEPS", ) + +gerrit_plugin = _gerrit_plugin +PLUGIN_DEPS = _plugin_deps +PLUGIN_TEST_DEPS = _plugin_test_deps