diff options
| author |  Julio Merino <jmmv@google.com> | 2016-02-23 03:29:21 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-23 13:09:51 +0000 |
| commit | d73c97d12e8325cbfb7fce3e985144c4fbcfddfe (patch) | |
| tree | f3125022cb36574101512d72df282c4920c9d6be /tools/build_rules | |
| parent | 2022ad876a991609984e42030453602bac9f2882 (diff) | |
Restore allow_files and single_file attributes.
//src/test/shell/bazel:bazel_example_test broke because of commit a6e448253c289f3d5a353f038a5ea47227515a66,
which removed the allow_files and single_file properties of a bunch of
attributes in the belief that they were stale. However, //third_party:protoc
is in fact a filegroup and thus requires single_file.
I still think some of them are unnecessary... but because I do not yet know
all possible cases in which these are involved, and to prevent further
breakage, let's restore them all just in case. I may reevaluate this at a
later stage to clean them up.
--
MOS_MIGRATED_REVID=115297686
Diffstat (limited to 'tools/build_rules')
| -rw-r--r-- | tools/build_rules/genproto.bzl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl index da0755527c..b0d8cf9e1a 100644 --- a/tools/build_rules/genproto.bzl +++ b/tools/build_rules/genproto.bzl @@ -51,11 +51,15 @@ gensrcjar = rule( # value, but Skylark needs to support select first. "_proto_compiler": attr.label( default = Label("@bazel_tools//third_party:protoc"), + allow_files = True, executable = True, + single_file = True, ), "_jar": attr.label( default = Label("@bazel_tools//tools/jdk:jar"), + allow_files = True, executable = True, + single_file = True, ), # The jdk dependency is required to ensure dependent libraries are found # when we invoke jar (see issue #938). @@ -63,6 +67,7 @@ gensrcjar = rule( # the jar dependency above should just do the right thing on its own. "_jdk": attr.label( default = Label("@bazel_tools//tools/jdk:jdk"), + allow_files = True, ), }, outputs = {"srcjar": "lib%{name}.srcjar"}, |