From be5b34424d34bd653bb1757abfaa5b690da1278f Mon Sep 17 00:00:00 2001 From: Jonathan Coveney Date: Wed, 20 Apr 2016 17:45:01 -0400 Subject: [PATCH] Make jdk dependency explicit --- thrift/thrift.bzl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/thrift/thrift.bzl b/thrift/thrift.bzl index f11dcc191..4fb0fe283 100644 --- a/thrift/thrift.bzl +++ b/thrift/thrift.bzl @@ -18,7 +18,7 @@ find {out}_tmp -exec touch -t 198001010000 {{}} \; rm -rf {out}_tmp""".format(out=ctx.outputs.libarchive.path, jar=ctx.file._jar.path) ctx.action( - inputs = ctx.files.srcs + ctx.files._jar, + inputs = ctx.files.srcs + ctx.files._jar + ctx.files._jdk, outputs = [ctx.outputs.libarchive], command = cmd, progress_message = "making thrift archive %s" % ctx.label, @@ -68,6 +68,7 @@ thrift_library = rule( "srcs": attr.label_list(allow_files=_thrift_filetype), "deps": attr.label_list(), "_jar": attr.label(executable=True, default=Label("@bazel_tools//tools/jdk:jar"), single_file=True, allow_files=True), + "_jdk": attr.label(default=Label("//tools/defaults:jdk"), allow_files=True), }, outputs={"libarchive": "lib%{name}.jar"}, ) \ No newline at end of file