Global cleanup change.

-- MOS_MIGRATED_REVID=132675557
r351574nc3 · Sep 12, 2016 · c02dc27 · c02dc27
1 parent dfb2c73
commit c02dc27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -46,25 +46,28 @@ 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
         # value, but Skylark needs to support select first.
         "_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,
         ),