Remove the $(ANDROID_CPU) Make variable.

RELNOTES[INC]: The $(ANDROID_CPU) Make variable is not available anymore. Use $(TARGET_CPU) after an Android configuration transition instead.

PiperOrigin-RevId: 199241622

1 files changed, 0 insertions, 23 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index dd00d3cd5a..e5f112064b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.android;
 import static com.google.devtools.build.lib.syntax.Type.STRING;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -279,15 +278,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
   @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS)
   public static class Options extends FragmentOptions {
     @Option(
-        name = "experimental_enable_android_cpu_make_variable",
-        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-        effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
-        metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-        defaultValue = "true",
-        help = "Flag to roll out the removal of the ANDROID_CPU Make variable.")
-    public boolean enableAndroidCpuMakeVariable;
-
-    @Option(
       name = "Android configuration distinguisher",
       defaultValue = "MAIN",
       converter = ConfigurationDistinguisherConverter.class,
@@ -898,7 +888,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
     }
   }
 
-  private final boolean enableAndroidCpuMakeVariable;
   private final Label sdk;
   private final String cpu;
   private final boolean useIncrementalNativeLibs;
@@ -936,7 +925,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
   private final boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
 
   AndroidConfiguration(Options options) throws InvalidConfigurationException {
-    this.enableAndroidCpuMakeVariable = options.enableAndroidCpuMakeVariable;
     this.sdk = options.sdk;
     this.useIncrementalNativeLibs = options.incrementalNativeLibs;
     this.cpu = options.cpu;
@@ -994,7 +982,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
 
   @AutoCodec.Instantiator
   AndroidConfiguration(
-      boolean enableAndroidCpuMakeVariable,
       Label sdk,
       String cpu,
       boolean useIncrementalNativeLibs,
@@ -1030,7 +1017,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
       boolean decoupleDataProcessing,
       boolean checkForMigrationTag,
       boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest) {
-    this.enableAndroidCpuMakeVariable = enableAndroidCpuMakeVariable;
     this.sdk = sdk;
     this.cpu = cpu;
     this.useIncrementalNativeLibs = useIncrementalNativeLibs;
@@ -1226,15 +1212,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
   }
 
   @Override
-  public void addGlobalMakeVariables(ImmutableMap.Builder<String, String> globalMakeEnvBuilder) {
-    if (!enableAndroidCpuMakeVariable) {
-      return;
-    }
-
-    globalMakeEnvBuilder.put("ANDROID_CPU", cpu);
-  }
-
-  @Override
   public String getOutputDirectoryName() {
     return configurationDistinguisher.suffix;
   }