diff options
| author |  Googler <noreply@google.com> | 2018-05-11 10:26:08 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-11 10:28:14 -0700 |
| commit | 6b0ccd10a8b372ca81f5fb00b9172e894dcfaaac (patch) | |
| tree | 0f955d3142fd05ffa213a20a0a444e298759279f | |
| parent | 4926eaf573589d063544b48462544b556c5b408e (diff) | |
Wrap a comment line around 80 chars.
RELNOTES: None.
PiperOrigin-RevId: 196272337
| -rw-r--r-- | scripts/BUILD | 2 | ||||
| -rw-r--r-- | src/BUILD | 2 | ||||
| -rw-r--r-- | src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD | 2 | ||||
| -rw-r--r-- | src/main/protobuf/build.proto | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/android/desugar/BUILD | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/scripts/BUILD b/scripts/BUILD index 32f2a39c31..ee6ef86c37 100644 --- a/scripts/BUILD +++ b/scripts/BUILD @@ -18,7 +18,7 @@ genrule( 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", @@ -361,7 +361,7 @@ genrule( # 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 a5055017e0..031793165f 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 @@ genrule( "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 4af9893b6f..ff328fee22 100644 --- a/src/main/protobuf/build.proto +++ b/src/main/protobuf/build.proto @@ -331,7 +331,8 @@ message Rule { 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 6487a8ee59..daae6920d3 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 @@ $(JAVABASE)/bin/javap -c -p -cp $< 'com.google.devtools.build.android.desugar.te 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"], ) |