1 files changed, 6 insertions, 10 deletions
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 cfaa226df0..65340007d8 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
@@ -84,6 +84,8 @@ public class AndroidCommon {
 
   private final RuleContext ruleContext;
   private final JavaCommon javaCommon;
+  private final boolean asNeverLink;
+  private final boolean exportDeps;
 
   private NestedSet<Artifact> compileTimeDependencyArtifacts;
   private NestedSet<Artifact> filesToBuild;
@@ -100,28 +102,22 @@ public class AndroidCommon {
   private Artifact genClassJar;
   private Artifact genSourceJar;
 
-  private boolean asNeverLink;
-  private boolean exportDeps;
   private Artifact manifestProtoOutput;
   private AndroidIdlHelper idlHelper;
 
-  public AndroidCommon(RuleContext ruleContext, JavaCommon javaCommon) {
-    this.ruleContext = ruleContext;
-    this.javaCommon = javaCommon;
-    this.asNeverLink = JavaCommon.isNeverLink(ruleContext);
+  public AndroidCommon(JavaCommon javaCommon) {
+    this(javaCommon, JavaCommon.isNeverLink(javaCommon.getRuleContext()), false);
   }
 
   /**
    * Creates a new AndroidCommon.
-   * @param ruleContext The rule context associated with this instance.
    * @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(
-      RuleContext ruleContext, JavaCommon common, boolean asNeverLink, boolean exportDeps) {
-    this.ruleContext = ruleContext;
+  public AndroidCommon(JavaCommon common, boolean asNeverLink, boolean exportDeps) {
+    this.ruleContext = common.getRuleContext();
     this.asNeverLink = asNeverLink;
     this.exportDeps = exportDeps;
     this.javaCommon = common;