Clean up JavaCommon constructors

BUG: 14473160

--
MOS_MIGRATED_REVID=107235668

4 files changed, 12 insertions, 12 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 4e716f80b6..e17201f940 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
@@ -94,7 +94,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
         ruleContext, javaSemantics, deps, deps, deps);
 
     AndroidCommon androidCommon = new AndroidCommon(
-        ruleContext, javaCommon, true /* asNeverLink */, true /* exportDeps */);
+        javaCommon, true /* asNeverLink */, true /* exportDeps */);
     try {
       ResourceDependencies resourceDeps = LocalResourceContainer.definesAndroidResources(
           ruleContext.attributes())
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;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index c228cd3083..3b4ae9321c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -68,7 +68,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
     NestedSet<Artifact> transitiveProguardConfigs =
         new ProguardLibrary(ruleContext).collectProguardSpecs();
     JavaCommon javaCommon = new JavaCommon(ruleContext, javaSemantics);
-    AndroidCommon androidCommon = new AndroidCommon(ruleContext, javaCommon);
+    AndroidCommon androidCommon = new AndroidCommon(javaCommon);
 
     boolean definesLocalResources =
       LocalResourceContainer.definesAndroidResources(ruleContext.attributes());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index 364e05ae0e..790994f5b5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -725,4 +725,8 @@ public class JavaCommon {
   public NestedSet<Artifact> getCompileTimeClasspath() {
     return classpathFragment.getCompileTimeClasspath();
   }
+  
+  public RuleContext getRuleContext() {
+    return ruleContext;
+  }
 }