diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-10-12 08:47:40 +0000 |
|---|---|---|
| committer | Lukacs Berki <lberki@google.com> | 2015-10-12 09:00:47 +0000 |
| commit | c74ee3784d3fd3a722f92c39805e57b4353a4509 (patch) | |
| tree | fcf7f95dd92f1c09ebf7790d858c9e83de670cdf /tools | |
| parent | 2b4979192035906f9d67013ec0f34614f5e96ede (diff) | |
Make Bazel use tools that are embedded in its binary.
This requires changing all "//tools/language:target" implicit dependencies to "@tools//tools/language:target".
--
MOS_MIGRATED_REVID=105193805
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_rules/appengine/appengine.bzl | 4 | ||||
| -rw-r--r-- | tools/build_rules/genproto.bzl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/build_rules/appengine/appengine.bzl b/tools/build_rules/appengine/appengine.bzl index 4e5e9bf2c3..b915b370e1 100644 --- a/tools/build_rules/appengine/appengine.bzl +++ b/tools/build_rules/appengine/appengine.bzl @@ -185,10 +185,10 @@ appengine_war = rule( executable = True, attrs = { "_java": attr.label( - default=Label("//tools/jdk:java"), + default=Label("@bazel_tools//tools/jdk:java"), single_file=True), "_zipper": attr.label( - default=Label("//third_party/ijar:zipper"), + default=Label("@bazel_tools//third_party/ijar:zipper"), single_file=True), "_runner_template": attr.label( default=Label("//tools/build_rules/appengine:runner_template"), diff --git a/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl index c8ea1751f6..b93f8b8e16 100644 --- a/tools/build_rules/genproto.bzl +++ b/tools/build_rules/genproto.bzl @@ -44,15 +44,15 @@ gensrcjar = rule( # TODO(bazel-team): this should be a hidden attribute with a default # value, but Skylark needs to support select first. "_proto_compiler": attr.label( - default=Label("//third_party:protoc"), + default=Label("@bazel_tools//third_party:protoc"), allow_files=True, single_file=True), "_jar": attr.label( - default=Label("//tools/jdk:jar"), + default=Label("@bazel_tools//tools/jdk:jar"), allow_files=True, single_file=True), "_jdk": attr.label( - default=Label("//tools/jdk:jdk"), + default=Label("@bazel_tools//tools/jdk:jdk"), allow_files=True), }, outputs={"srcjar": "lib%{name}.srcjar"}, @@ -64,7 +64,7 @@ def proto_java_library(name, src): native.java_library( name=name, srcs=[name + "_srcjar"], - deps=["//third_party:protobuf"], + deps=["@bazel_tools//third_party:protobuf"], # The generated code has lots of 'rawtypes' warnings. javacopts=["-Xlint:-rawtypes"], ) |