aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2016-10-06 13:48:27 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-10-07 08:05:02 +0000
commit7cde82ec1c1a3b0a6c931417f81e4d6ed8e08455 (patch)
treeb849eedbe019a0849df2b360bb329961a85ee785
parentf21d35ead25167ca7191229c7a365ccdf1a2550e (diff)
Remove HOST_CFG and DATA_CFG references that cause warnings
-- MOS_MIGRATED_REVID=135353307
-rwxr-xr-xsrc/test/shell/bazel/bazel_worker_test.sh2
-rw-r--r--tools/build_rules/java_rules_skylark.bzl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/shell/bazel/bazel_worker_test.sh b/src/test/shell/bazel/bazel_worker_test.sh
index 2d19ad3c80..224fa9e205 100755
--- a/src/test/shell/bazel/bazel_worker_test.sh
+++ b/src/test/shell/bazel/bazel_worker_test.sh
@@ -111,7 +111,7 @@ def _impl(ctx):
work = rule(
implementation=_impl,
attrs={
- "worker": attr.label(cfg=HOST_CFG, mandatory=True, allow_files=True, executable=True),
+ "worker": attr.label(cfg="host", mandatory=True, allow_files=True, executable=True),
"worker_args": attr.string_list(),
"args": attr.string_list(),
"srcs": attr.label_list(allow_files=True),
diff --git a/tools/build_rules/java_rules_skylark.bzl b/tools/build_rules/java_rules_skylark.bzl
index dfd9288c78..07539f5c1c 100644
--- a/tools/build_rules/java_rules_skylark.bzl
+++ b/tools/build_rules/java_rules_skylark.bzl
@@ -182,7 +182,7 @@ java_library_attrs = {
"_javac": attr.label(default=Label("//tools/jdk:javac"), single_file=True),
"_jar": attr.label(default=Label("//tools/jdk:jar"), single_file=True),
"_jdk": attr.label(default=Label("//tools/jdk:jdk"), allow_files=True),
- "data": attr.label_list(allow_files=True, cfg=DATA_CFG),
+ "data": attr.label_list(allow_files=True, cfg="data"),
"resources": attr.label_list(allow_files=True),
"srcs": attr.label_list(allow_files=java_filetype),
"jars": attr.label_list(allow_files=jar_filetype),