2 files changed, 3 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index de3d34ebcf..5393ae697f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -53,7 +53,6 @@ import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate;
 import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate.OutputPathMapper;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode;
-import com.google.devtools.build.lib.analysis.whitelisting.Whitelist;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -120,11 +119,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     javaSemantics.checkRule(ruleContext, javaCommon);
     javaSemantics.checkForProtoLibraryAndJavaProtoLibraryOnSameProto(ruleContext, javaCommon);
 
-    AndroidCommon androidCommon =
-        new AndroidCommon(
-            javaCommon,
-            /* asNeverLink= */ true,
-            /* exportDeps= */ Whitelist.isAvailable(ruleContext, "export_deps"));
+    AndroidCommon androidCommon = new AndroidCommon(javaCommon, /* asNeverLink= */ true);
     ResourceDependencies resourceDeps =
         ResourceDependencies.fromRuleDeps(ruleContext, /* neverlink= */ false);
     RuleConfiguredTargetBuilder builder =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 1bf24af0b6..76ec398342 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -127,7 +127,6 @@ public class AndroidCommon {
   private final RuleContext ruleContext;
   private final JavaCommon javaCommon;
   private final boolean asNeverLink;
-  private final boolean exportDeps;
 
   private NestedSet<Artifact> filesToBuild;
   private NestedSet<Artifact> transitiveNeverlinkLibraries =
@@ -151,7 +150,7 @@ public class AndroidCommon {
   private AndroidIdlHelper idlHelper;
 
   public AndroidCommon(JavaCommon javaCommon) {
-    this(javaCommon, JavaCommon.isNeverLink(javaCommon.getRuleContext()), false);
+    this(javaCommon, JavaCommon.isNeverLink(javaCommon.getRuleContext()));
   }
 
   /**
@@ -160,12 +159,10 @@ public class AndroidCommon {
    * @param common the JavaCommon instance
    * @param asNeverLink Boolean to indicate if this rule should be treated as a compile time dep by
    *     consuming rules.
-   * @param exportDeps Boolean to indicate if the dependencies should be treated as "exported" deps.
    */
-  public AndroidCommon(JavaCommon common, boolean asNeverLink, boolean exportDeps) {
+  public AndroidCommon(JavaCommon common, boolean asNeverLink) {
     this.ruleContext = common.getRuleContext();
     this.asNeverLink = asNeverLink;
-    this.exportDeps = exportDeps;
     this.javaCommon = common;
   }
 
@@ -654,9 +651,6 @@ public class AndroidCommon {
     if (collectJavaCompilationArgs) {
       boolean hasSources = attributes.hasSources();
       this.javaCompilationArgs = collectJavaCompilationArgs(asNeverLink, hasSources);
-      if (exportDeps) {
-        this.javaCompilationArgs = JavaCompilationArgsProvider.makeNonStrict(javaCompilationArgs);
-      }
     }
   }