aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Vladimir Moskva <vladmos@google.com>2016-09-09 15:14:25 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-09-12 08:54:36 +0000
commitc02dc27f388debddde0b24eaa7d4590f6979bb42 (patch)
tree362b00381c40e891473755d065d0ad9f5b4530aa
parentdfb2c73eda3d2dd8787ea9b2d0a03b49dfa2acc5 (diff)
Global cleanup change.
-- MOS_MIGRATED_REVID=132675557
-rw-r--r--src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl4
-rw-r--r--tools/build_defs/apple/swift.bzl1
-rw-r--r--tools/build_rules/genproto.bzl5
3 files changed, 7 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl b/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl
index 79d1ae7601..6e9b266257 100644
--- a/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl
+++ b/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl
@@ -563,12 +563,12 @@ def _aspect_def(impl):
attrs = {
"_package_parser": attr.label(
default = tool_label("//tools/android:PackageParser"),
- cfg = HOST_CFG,
+ cfg = "host",
executable = True,
allow_files = True),
"_jar_filter": attr.label(
default = tool_label("//tools/android:JarFilter"),
- cfg = HOST_CFG,
+ cfg = "host",
executable = True,
allow_files = True),
},
diff --git a/tools/build_defs/apple/swift.bzl b/tools/build_defs/apple/swift.bzl
index de3aa5d968..004d1a524a 100644
--- a/tools/build_defs/apple/swift.bzl
+++ b/tools/build_defs/apple/swift.bzl
@@ -256,6 +256,7 @@ swift_library = rule(
"defines": attr.string_list(mandatory=False, allow_empty=True),
"_xcrunwrapper": attr.label(
executable=True,
+ cfg="host",
default=Label(XCRUNWRAPPER_LABEL))},
fragments = ["apple", "objc"],
output_to_genfiles=True,
diff --git a/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl
index aa12e5e658..b067f12672 100644
--- a/tools/build_rules/genproto.bzl
+++ b/tools/build_rules/genproto.bzl
@@ -46,12 +46,13 @@ gensrcjar = rule(
single_file = True,
),
"grpc_java_plugin": attr.label(
- cfg = HOST_CFG,
+ cfg = "host",
executable = True,
single_file = True,
),
"_gensrcjar": attr.label(
default = Label(str(Label("//tools/build_rules:gensrcjar"))),
+ cfg = "host",
executable = True,
),
# TODO(bazel-team): this should be a hidden attribute with a default
@@ -59,12 +60,14 @@ gensrcjar = rule(
"_proto_compiler": attr.label(
default = Label("//third_party/protobuf:protoc"),
allow_files = True,
+ cfg = "host",
executable = True,
single_file = True,
),
"_jar": attr.label(
default = Label("@bazel_tools//tools/jdk:jar"),
allow_files = True,
+ cfg = "host",
executable = True,
single_file = True,
),