Add a flag to remove Java Make variables from Jvm.

These depend on package loading and thus must be gone.

RELNOTES: None.
PiperOrigin-RevId: 171132297

1 files changed, 12 insertions, 0 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 a6662b2a65..dfc01bd953 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
@@ -527,6 +527,18 @@ public class JavaOptions extends FragmentOptions {
   )
   public boolean disableAbsoluteJavabase;
 
+  @Option(
+      name = "experimental_enable_jvm_configuration_make_variables",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.UNKNOWN},
+      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
+      help = "If enabled, the Java configuration fragment supplies the JAVA and JAVABASE "
+          + "Make variables. This option is used in the migration to remove them in favor of "
+          + "requiring an explicit dependency on the Java runtime for rules that use them."
+  )
+  public boolean enableMakeVariables;
+
   // Plugins are built using the host config. To avoid cycles we just don't propagate
   // this option to the host config. If one day we decide to use plugins when building
   // host tools, we can improve this by (for example) creating a compiler configuration that is