diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2017-02-21 20:59:49 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-02-22 08:27:39 +0000 |
| commit | 7a1ea78dad4d0562d5383ab44d53a3cace3c26e6 (patch) | |
| tree | 7af1ce12950c3ad24ceedd4cdb8b24b427789442 | |
| parent | cf9a2b662b2764fd3bddcb74d9a0ab70eb2f7f3d (diff) | |
Rollback of commit 3da16e3b4e8be4d4c4a6eae80365a85851e3253d.
*** Reason for rollback ***
rules_closure needs to set go/be#java_plugin.generates_api to 1 for dagger
*** Original change description ***
Disable Java header compilation by default in Bazel.
Enabling this by default broke rules_closure at HEAD:
http://ci.bazel.io/view/Dashboard/job/rules_closure/BAZEL_VERSION=HEAD,PLATFORM_NAME=linux-x86_64/711/console
--
PiperOrigin-RevId: 148132758
MOS_MIGRATED_REVID=148132758
| -rw-r--r-- | tools/jdk/BUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 1fe912bc06..cbfe203cda 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( @@ -113,7 +113,7 @@ java_toolchain( bootclasspath = [":bootclasspath"], encoding = "UTF-8", extclasspath = [":extclasspath"], - forcibly_disable_header_compilation = 1, + forcibly_disable_header_compilation = 0, genclass = ["//tools/jdk:GenClass_deploy.jar"], header_compiler = ["//tools/jdk:turbine_deploy.jar"], ijar = ["@bazel_tools//tools/jdk:ijar"], |