diff options
author | Liam Miller-Cushon <cushon@google.com> | 2015-12-03 20:54:20 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-12-04 21:06:23 +0000 |
commit | 2633eafa646930fdc63e0dab54ef1a22222131cf (patch) | |
tree | b8cdec1657c6d28b454b457e796f115eb7f1917a /src/main/java/com/google | |
parent | 220be7a7362bb27f3a23b2328b36d1a55f6f9197 (diff) |
Delete --allow_precompiled_jars_in_srcs
--
MOS_MIGRATED_REVID=109337486
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java | 7 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java | 6 |
2 files changed, 0 insertions, 13 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 83ebef3c68..cab2b8f546 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 @@ -141,7 +141,6 @@ public final class JavaConfiguration extends Fragment { private final TriState bundleTranslations; private final ImmutableList<Label> translationTargets; private final String javaCpu; - private final boolean allowPrecompiledJarsInSrcs; private final JavaOptimizationMode javaOptimizationMode; private final Label javaToolchain; @@ -169,7 +168,6 @@ public final class JavaConfiguration extends Fragment { this.bundleTranslations = javaOptions.bundleTranslations; this.javaCpu = javaCpu; this.javaToolchain = javaToolchain; - this.allowPrecompiledJarsInSrcs = javaOptions.allowPrecompiledJarsInSrcs; this.javaOptimizationMode = javaOptions.javaOptimizationMode; ImmutableList.Builder<Label> translationsBuilder = ImmutableList.builder(); @@ -330,11 +328,6 @@ public final class JavaConfiguration extends Fragment { return javaToolchain; } - /** Returns whether pre-compiled jar files should be allowed in srcs. */ - public boolean allowPrecompiledJarsInSrcs() { - return allowPrecompiledJarsInSrcs; - } - /** * Returns the --java_optimization_mode flag setting. Note that running with a different mode over * the same binary or test target typically invalidates the cached output Jar for that target, 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 f7da293136..df524dc3f4 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 @@ -382,12 +382,6 @@ public class JavaOptions extends FragmentOptions { help = "Disables the Jvm configuration entirely.") public boolean disableJvm; - @Option(name = "allow_precompiled_jars_in_srcs", - defaultValue = "false", - category = "undocumented", - help = "No-op. Kept here for backwards compatibility.") - public boolean allowPrecompiledJarsInSrcs; - @Option(name = "java_optimization_mode", defaultValue = "legacy", converter = JavaOptimizationModeConverter.class, |