Removing unused and deprecated Bazel Java flags.
PiperOrigin-RevId: 374424643
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 0ab9782..c467577 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
@@ -174,15 +174,6 @@
+ "but error messages can be different.")
public boolean useIjars;
- @Deprecated
- @Option(
- name = "use_src_ijars",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public boolean useSourceIjars;
-
@Option(
name = "java_header_compilation",
defaultValue = "true",
@@ -192,16 +183,6 @@
oldName = "experimental_java_header_compilation")
public boolean headerCompilation;
- // TODO(cushon): delete flag after removing from global .blazerc
- @Deprecated
- @Option(
- name = "experimental_optimize_header_compilation_annotation_processing",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "This flag is a noop and scheduled for removal.")
- public boolean optimizeHeaderCompilationAnnotationProcessing;
-
@Option(
name = "java_deps",
defaultValue = "true",
@@ -291,62 +272,6 @@
public boolean explicitJavaTestDeps;
@Option(
- name = "javabuilder_top",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String javaBuilderTop;
-
- @Option(
- name = "singlejar_top",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String singleJarTop;
-
- @Option(
- name = "genclass_top",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String genClassTop;
-
- @Option(
- name = "ijar_top",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String iJarTop;
-
- @Option(
- name = "java_langtools",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String javaLangtoolsJar;
-
- @Option(
- name = "javac_bootclasspath",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String javacBootclasspath;
-
- @Option(
- name = "javac_extdir",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public String javacExtdir;
-
- @Option(
name = "host_java_launcher",
defaultValue = "null",
converter = EmptyToNullLabelConverter.class,
@@ -426,16 +351,6 @@
+ " *.pgcfg file extension.")
public boolean enforceProguardFileExtension;
- @Deprecated
- @Option(
- name = "check_constraint",
- allowMultiple = true,
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- help = "No-op. Kept here for backwards compatibility.")
- public List<String> checkedConstraints;
-
@Option(
name = "java_optimization_mode",
defaultValue = "",
@@ -630,19 +545,6 @@
help = "The Java language version used to execute the tools that are needed during a build")
public String hostJavaLanguageVersion;
- // TODO(b/180107817): delete flag after removing from global .blazerc
- @Option(
- name = "incompatible_dont_collect_so_artifacts",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.UNKNOWN},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help = "This flag is a noop and scheduled for removal.")
- public boolean dontCollectSoArtifacts;
-
@Option(
name = "incompatible_dont_collect_native_libraries_in_data",
defaultValue = "false",
@@ -668,14 +570,6 @@
public boolean requireJavaPluginInfo;
@Option(
- name = "experimental_publish_javacclinkparamsinfo",
- defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.NO_OP},
- help = "Deprecated no-op.")
- public boolean experimentalPublishJavaCcLinkParamsInfo;
-
- @Option(
name = "experimental_enable_jspecify",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
@@ -763,7 +657,6 @@
host.experimentalTurbineAnnotationProcessing = experimentalTurbineAnnotationProcessing;
- host.dontCollectSoArtifacts = dontCollectSoArtifacts;
host.dontCollectDataLibraries = dontCollectDataLibraries;
host.requireJavaPluginInfo = requireJavaPluginInfo;
