opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Bazel: Don't depend directly on @local_jdk in java_doc rule

Change-Id: Iba299658f200b30dbf3b7cea5a7e6a4e4b89eaee
This commit is contained in:
David Pursehouse 2018-08-27 18:43:30 +09:00
commit 2c8144925c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/bzl/javadoc.bzl
View File

@ -36,7 +36,7 @@ def _impl(ctx):
"rm -rf %s" % dir, "rm -rf %s" % dir,
"mkdir %s" % dir, "mkdir %s" % dir,
" ".join([ " ".join([
ctx.file._javadoc.path, "%s/bin/javadoc" % ctx.attr._jdk[java_common.JavaRuntimeInfo].java_home,
"-Xdoclint:-missing", "-Xdoclint:-missing",
"-protected", "-protected",
"-encoding UTF-8", "-encoding UTF-8",
@ -67,14 +67,10 @@ java_doc = rule(
"pkgs": attr.string_list(), "pkgs": attr.string_list(),
"title": attr.string(), "title": attr.string(),
"external_docs": attr.string_list(), "external_docs": attr.string_list(),
"_javadoc": attr.label(
default = Label("@local_jdk//:bin/javadoc"),
single_file = True,
allow_files = True,
),
"_jdk": attr.label( "_jdk": attr.label(
default = Label("@local_jdk//:jdk-default"), default = Label("@bazel_tools//tools/jdk:current_java_runtime"),
allow_files = True, allow_files = True,
providers = [java_common.JavaRuntimeInfo],
), ),
}, },
outputs = {"zip": "%{name}.zip"}, outputs = {"zip": "%{name}.zip"},