commit 39e5a46294de31baa0411f6a59119427c66305da
author Damien Martin-Guillerez <dmarting@google.com> Tue Dec 20 10:58:17 2016 +0000
committer Klaus Aehlig <aehlig@google.com> Tue Dec 20 11:07:10 2016 +0000
tree 90aaf7e33e5e547508e032a6c652635daf7164b1
parent d40c78a98e2b1f562170396f94bf54d17c6958d0

Fix cycle in dependency graph during bootstrap

This cycle was due to JacocoCoverage_deploy.jar being an implicit dependency
of java_binary. We do not need the binary during bootstrap because we are not
running with coverage but we need the target. Simply move it to exists as a
java_import in tools/jdk.

Fixes #2269.
To be cherry-picked for #2246.

--
Change-Id: I63aee0e76b305833ac0c0c2cae5abe1cbad5e6d1
Reviewed-on: https://cr.bazel.build/8036
PiperOrigin-RevId: 142537244
MOS_MIGRATED_REVID=142537244

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index aab88a3..a3f0ed7 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -42,6 +42,7 @@
   case "$i" in
     *tools/jdk/BUILD*) OUTPUT_PATH=tools/jdk/BUILD ;;
     *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
+    *JacocoCoverage*_deploy.jar) OUTPUT_PATH=tools/jdk/JacocoCoverage_deploy.jar ;;
     *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;;
     *javac-9-dev-r3297-1.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r3297-1.jar ;;
     *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;;

src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD

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 863bcc0..4d0ff82 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -22,7 +22,6 @@
 filegroup(
     name = "embedded_tools",
     srcs = [
-        "BUILD.tools",
         "JacocoCoverage_deploy.jar",
     ],
 )

src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD.tools

diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD.tools b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD.tools
deleted file mode 100644
index c52cacc..0000000
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD.tools
+++ /dev/null
@@ -1,8 +0,0 @@
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-java_import(
-    name = "JacocoCoverage",
-    jars = ["JacocoCoverage_deploy.jar"],
-)

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 5b5596b..badd086 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -162,7 +162,7 @@
     actual = "//third_party/java/jacoco:blaze-agent",
 )
 
-alias(
+java_import(
     name = "JacocoCoverage",
-    actual = "//src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage",
+    jars = [":JacocoCoverage_deploy.jar"],
 )