diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2017-02-06 19:08:08 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-06 19:36:10 +0000 |
| commit | 9e3f9ce37467158798a981e637f584d772a2d1bd (patch) | |
| tree | 4a8dd34b172c7d0f8a9b1fe069f8533bcc9430b4 /tools | |
| parent | e4d2e81646d91a02d2985361acf9625dab8a8c76 (diff) | |
Rollback of commit a80099b6de04dec802b556768f8c5f1c299c83ee.
*** Reason for rollback ***
Header compilation is now explicitly disabled for JDK 7 Bazel using java_toolchain.forcibly_disable_header_compilation
*** Original change description ***
Automated [] rollback of commit 156adeec613ab140a91d73e1147bc688689bcfb7.
*** Reason for rollback ***
Breaks Bazel on JDK 7: http://ci.bazel.io/view/Dashboard/job/bazel-tests/BAZEL_VERSION=HEAD-jdk7,PLATFORM_NAME=linux-x86_64/475/console
*** Original change description ***
Automated [] rollback of commit 5163ec2c0db8fbdc7f367bb4aca5b6d7ae6d80b0.
*** Reason for rollback ***
See unknown commit
*** Original change description ***
Automated [] rollback of commit c9dbd4c1a4a4b4345c0b3924f86e01612ae12807.
*** Reason for rollback ***
Breaks bazel-docker-tests
http://ci.baz...
***
--
PiperOrigin-RevId: 146685610
MOS_MIGRATED_REVID=146685610
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jdk/BUILD | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index badd08609d..e55fea2f1c 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -9,7 +9,7 @@ genrule( name = "BUILD-jdk7", srcs = [":BUILD"], outs = ["BUILD.jdk7"], - cmd = "sed -e 's/_version = \"8\"/_version = \"7\"/' -e 's/javac_supports_workers = 1/javac_supports_workers = 0/' $< > $@", + cmd = "sed -e 's/_version = \"8\"/_version = \"7\"/' -e 's/javac_supports_workers = 1/javac_supports_workers = 0/' -e 's/forcibly_disable_header_compilation = 0/forcibly_disable_header_compilation = 1/g' $< > $@", ) filegroup( @@ -107,6 +107,7 @@ java_toolchain( bootclasspath = [":bootclasspath"], encoding = "UTF-8", extclasspath = [":extdir"], + forcibly_disable_header_compilation = 0, genclass = ["//tools/jdk:GenClass_deploy.jar"], header_compiler = ["//tools/jdk:turbine_deploy.jar"], ijar = ["@bazel_tools//tools/jdk:ijar"], @@ -117,6 +118,9 @@ java_toolchain( "-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1", ], + misc = [ + "-XDskipDuplicateBridges=true", + ], singlejar = ["//tools/jdk:SingleJar_deploy.jar"], source_version = "8", target_version = "8", |