aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java2
-rw-r--r--tools/jdk/BUILD3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index 8924e00701..a4fc89cc12 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -165,7 +165,7 @@ public class JavaOptions extends FragmentOptions {
@Option(
name = "java_header_compilation",
- defaultValue = "false",
+ defaultValue = "true",
category = "semantics",
help = "Compile ijars directly from source.",
oldName = "experimental_java_header_compilation"
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index badd08609d..1ec5d8760e 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -117,6 +117,9 @@ java_toolchain(
"-XX:+TieredCompilation",
"-XX:TieredStopAtLevel=1",
],
+ misc = [
+ "-XDskipDuplicateBridges=true",
+ ],
singlejar = ["//tools/jdk:SingleJar_deploy.jar"],
source_version = "8",
target_version = "8",