Make transitive starlark loads explicit This fixes the build with bazel 0.25. Bug: Issue 10855 Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d
diff --git a/WORKSPACE b/WORKSPACE index 9fdfa30..df793d6 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "39310fb43f4eaaad2e338b3bcbf393a2f4e11293", + commit = "8a96621f0c36fa9d5291377b0c3b63d8a9112848", #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/plugin.bzl b/tools/bzl/plugin.bzl index c157125..89a1643 100644 --- a/tools/bzl/plugin.bzl +++ b/tools/bzl/plugin.bzl
@@ -1,5 +1,8 @@ load( "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", - "PLUGIN_DEPS", - "gerrit_plugin", + _gerrit_plugin = "gerrit_plugin", + _plugin_deps = "PLUGIN_DEPS", ) + +gerrit_plugin = _gerrit_plugin +PLUGIN_DEPS = _plugin_deps