aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/BUILD3
-rw-r--r--src/test/java/com/google/devtools/build/android/desugar/BUILD3
2 files changed, 6 insertions, 0 deletions
diff --git a/scripts/BUILD b/scripts/BUILD
index 7c782cc760..ee6ef86c37 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD
@@ -16,6 +16,9 @@ genrule(
"--prepend=$(location bazel-complete-template.bash)",
]),
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_java_runtime"],
tools = [
":generate_bash_completion.sh",
"//src:bazel",
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 4337390539..5100643926 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/BUILD
+++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD
@@ -1594,6 +1594,9 @@ genrule(
$(JAVABASE)/bin/javap -c -p -cp $< 'com.google.devtools.build.android.desugar.testdata.Lambda$$$$Lambda$$0' > $@
""",
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_java_runtime"],
tools = ["@bazel_tools//tools/jdk"],
)