diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-12-20 10:58:17 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-12-20 11:07:10 +0000 |
| commit | 39e5a46294de31baa0411f6a59119427c66305da (patch) | |
| tree | 90aaf7e33e5e547508e032a6c652635daf7164b1 | |
| parent | d40c78a98e2b1f562170396f94bf54d17c6958d0 (diff) | |
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
| -rwxr-xr-x | src/create_embedded_tools.sh | 1 | ||||
| -rw-r--r-- | src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD | 1 | ||||
| -rw-r--r-- | src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD.tools | 8 | ||||
| -rw-r--r-- | tools/jdk/BUILD | 4 |
4 files changed, 3 insertions, 11 deletions
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index aab88a369e..a3f0ed76d8 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -42,6 +42,7 @@ for i in $*; do 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 ;; 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 863bcc060c..4d0ff8278e 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( filegroup( name = "embedded_tools", srcs = [ - "BUILD.tools", "JacocoCoverage_deploy.jar", ], ) 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 c52cacce2a..0000000000 --- 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"], -) diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 5b5596b118..badd08609d 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -162,7 +162,7 @@ alias( 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"], ) |