Add Android aspect ijar support.

--
MOS_MIGRATED_REVID=104296834

1 files changed, 4 insertions, 2 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 f4e5d67d2b..c071a03a85 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
@@ -93,6 +93,7 @@ public class AndroidCommon {
   private JavaCompilationArgs recursiveJavaCompilationArgs = JavaCompilationArgs.EMPTY_ARGS;
   private JackCompilationHelper jackCompilationHelper;
   private Artifact classJar;
+  private Artifact iJar;
   private Artifact srcJar;
   private Artifact genClassJar;
   private Artifact genSourceJar;
@@ -556,7 +557,7 @@ public class AndroidCommon {
     filesToBuild = filesBuilder.build();
 
     if ((attributes.hasSourceFiles() || attributes.hasSourceJars()) && jar != null) {
-      helper.createCompileTimeJarAction(jar, outputDepsProto, javaArtifactsBuilder);
+      iJar = helper.createCompileTimeJarAction(jar, outputDepsProto, javaArtifactsBuilder);
     }
     javaCommon.setJavaCompilationArtifacts(javaArtifactsBuilder.build());
 
@@ -596,7 +597,8 @@ public class AndroidCommon {
 
     return builder
         .setFilesToBuild(filesToBuild)
-        .add(JavaRuleOutputJarsProvider.class, new JavaRuleOutputJarsProvider(classJar, srcJar))
+        .add(JavaRuleOutputJarsProvider.class, new JavaRuleOutputJarsProvider(
+            classJar, iJar, srcJar))
         .add(
             JavaRuntimeJarProvider.class,
             new JavaRuntimeJarProvider(javaCommon.getJavaCompilationArtifacts().getRuntimeJars()))