Wrap a comment line around 80 chars.
RELNOTES: None.
PiperOrigin-RevId: 196272337
diff --git a/scripts/BUILD b/scripts/BUILD
index 32f2a39..ee6ef86 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD
@@ -18,7 +18,7 @@
output_to_bindir = 1,
# Bazel 0.8.0 doesn't have this target under @bazel_tools, so we have to
# use it from the main repository
- toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
+ toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
tools = [
":generate_bash_completion.sh",
"//src:bazel",
diff --git a/src/BUILD b/src/BUILD
index 9c30902..8f5da4f 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -361,7 +361,7 @@
# Technically, this should be prefixed with @bazel_tools, but in order to
# avoid having to wait a Bazel release which has this target under
# @bazel_tools, we use it from the main repository. It's the same anyway.
- toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
+ toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
tools = ["combine_derived_java_srcs.sh"],
visibility = ["//:__pkg__"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
index a505501..0317931 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -70,7 +70,7 @@
"rm -fr \"$${JARJAR}\"",
]),
tags = ["manual"],
- toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
+ toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
tools = [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//third_party/jarjar:jarjar_bin_deploy.jar",
diff --git a/src/main/protobuf/build.proto b/src/main/protobuf/build.proto
index 4af9893..ff328fe 100644
--- a/src/main/protobuf/build.proto
+++ b/src/main/protobuf/build.proto
@@ -331,7 +331,8 @@
optional string skylark_environment_hash_code = 12;
}
-// A pairing of attribute name and a Skylark aspect that is applied to that attribute.
+// A pairing of attribute name and a Skylark aspect that is applied to that
+// attribute.
message AttributeAspect {
required string attribute_name = 1;
required SkylarkAspect aspect = 2;
diff --git a/src/test/java/com/google/devtools/build/android/desugar/BUILD b/src/test/java/com/google/devtools/build/android/desugar/BUILD
index 6487a8e..daae692 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD
@@ -1620,7 +1620,7 @@
tags = ["no_windows"],
# Bazel 0.8.0 doesn't have this target under @bazel_tools, so we have to
# use the one in the main repository
- toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
+ toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
tools = ["@bazel_tools//tools/jdk"],
)
