Remove all traces of --java_cpu.

It would have been nice to also remove JavaCpuSupplier, but that does not work for two reasons: Bazel relies on it always being "default".

--
MOS_MIGRATED_REVID=97202267

4 files changed, 10 insertions, 24 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index dfbcc4244a..c219e2ea3e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -138,8 +138,7 @@ public class BazelRuleClassProvider {
     @Override
     public String getJavaCpu(BuildOptions buildOptions, ConfigurationEnvironment env)
         throws InvalidConfigurationException {
-      JavaOptions javaOptions = buildOptions.get(JavaOptions.class);
-      return javaOptions.javaCpu == null ? "default" : javaOptions.javaCpu;
+      return "default";
     }
   };
 
@@ -352,8 +351,8 @@ public class BazelRuleClassProvider {
         Functions.<String>identity()));
     builder.addConfigurationFragment(new PythonConfigurationLoader(Functions.<String>identity()));
     builder.addConfigurationFragment(new BazelPythonConfiguration.Loader());
-    builder.addConfigurationFragment(new JvmConfigurationLoader(JAVA_CPU_SUPPLIER));
-    builder.addConfigurationFragment(new JavaConfigurationLoader(JAVA_CPU_SUPPLIER));
+    builder.addConfigurationFragment(new JvmConfigurationLoader(false, JAVA_CPU_SUPPLIER));
+    builder.addConfigurationFragment(new JavaConfigurationLoader());
     builder.addConfigurationFragment(new ObjcConfigurationLoader());
     builder.addConfigurationFragment(new J2ObjcConfiguration.Loader());
     builder.addConfigurationFragment(new AndroidConfiguration.Loader());
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 af71c7e435..37137c9db1 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
@@ -128,13 +128,6 @@ public final class JavaConfiguration extends Fragment {
   }
 
   /**
-   * Returns the Java cpu.
-   */
-  public String getJavaCpu() {
-    return javaCpu;
-  }
-
-  /**
    * Returns the default javabuilder jar
    */
   public Label getDefaultJavaBuilderJar() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
index 3d83a926a4..15cfbfc7ff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
@@ -22,6 +22,7 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
+import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
 import com.google.devtools.build.lib.syntax.Label;
 
@@ -30,12 +31,6 @@ import com.google.devtools.build.lib.syntax.Label;
  * command-line options.
  */
 public class JavaConfigurationLoader implements ConfigurationFragmentFactory {
-  private final JavaCpuSupplier cpuSupplier;
-
-  public JavaConfigurationLoader(JavaCpuSupplier cpuSupplier) {
-    this.cpuSupplier = cpuSupplier;
-  }
-
   @Override
   public ImmutableSet<Class<? extends FragmentOptions>> requiredOptions() {
     return ImmutableSet.<Class<? extends FragmentOptions>>of(JavaOptions.class);
@@ -45,11 +40,16 @@ public class JavaConfigurationLoader implements ConfigurationFragmentFactory {
   @Override
   public JavaConfiguration create(ConfigurationEnvironment env, BuildOptions buildOptions)
       throws InvalidConfigurationException {
+    CppConfiguration cppConfiguration = env.getFragment(buildOptions, CppConfiguration.class);
+    if (cppConfiguration == null) {
+      return null;
+    }
+
     JavaOptions javaOptions = buildOptions.get(JavaOptions.class);
 
     Label javaToolchain = RedirectChaser.followRedirects(env, javaOptions.javaToolchain,
         "java_toolchain");
-    return create(javaOptions, javaToolchain, cpuSupplier.getJavaCpu(buildOptions, env));
+    return create(javaOptions, javaToolchain, cppConfiguration.getTargetCpu());
   }
 
   @Override
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 d35c0ef4cb..0e42112b1f 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
@@ -184,12 +184,6 @@ public class JavaOptions extends FragmentOptions {
       help = "Enables reduced classpaths for Java compilations.")
   public JavaClasspathMode experimentalJavaClasspath;
 
-  @Option(name = "java_cpu",
-      defaultValue = "null",
-      category = "semantics",
-      help = "The Java target CPU. Default is k8.")
-  public String javaCpu;
-
   @Option(name = "java_debug",
       defaultValue = "null",
       category = "testing",