diff options
author | cushon <cushon@google.com> | 2017-05-03 15:11:52 +0200 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-05-03 17:26:21 +0200 |
commit | b6c6d5d95ebc4d507aaf637db1f815dbdb8bea77 (patch) | |
tree | 5d3c5c3155a105ba1407ba7d5251d05c9b1ca837 /src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java | |
parent | 3209a7d61ca24db10d76709e489f02bc46b98b92 (diff) |
Automated g4 rollback of commit f2f7839eefe1274bf9e25708201ec3cd89b19846.
*** Reason for rollback ***
The experiment did not succeed. It is valid for the fallback to succeed if
the original failure was due to a Strict Java Deps error, so enabling
this feature as it is currently implemented is not possible.
PiperOrigin-RevId: 154948042
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java index 03ae91dd8f..31f9fefbae 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java @@ -131,7 +131,6 @@ public final class JavaConfiguration extends Fragment { private final boolean useIjars; private final boolean useHeaderCompilation; private final boolean headerCompilationDirectClasspath; - private final boolean headerCompilationDirectClasspathFallbackError; private final boolean generateJavaDeps; private final boolean strictDepsJavaProtos; private final boolean enforceOneVersion; @@ -164,8 +163,6 @@ public final class JavaConfiguration extends Fragment { this.useIjars = javaOptions.useIjars; this.useHeaderCompilation = javaOptions.headerCompilation; this.headerCompilationDirectClasspath = javaOptions.headerCompilationDirectClasspath; - this.headerCompilationDirectClasspathFallbackError = - javaOptions.headerCompilationDirectClasspathFallbackError; this.generateJavaDeps = generateJavaDeps; this.javaClasspath = javaOptions.javaClasspath; this.defaultJvmFlags = ImmutableList.copyOf(defaultJvmFlags); @@ -252,14 +249,6 @@ public final class JavaConfiguration extends Fragment { } /** - * Returns true if transitive classpath fallback should be an error when {@link - * #headerCompilationDirectClasspath} is enabled. - */ - public boolean headerCompilationDirectClasspathFallbackError() { - return headerCompilationDirectClasspathFallbackError; - } - - /** * Returns true iff dependency information is generated after compilation. */ public boolean getGenerateJavaDeps() { |