Fix handling of jdeps files in android_* rules

If header compilation is enabled, the compile-time dependency information is
produced by the header compilation action. The android rules were incorrectly
using the dependency information from the regular compilation, which defeated
the critical path improvement from header compilation.

--
MOS_MIGRATED_REVID=129505189

1 files changed, 6 insertions, 5 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 60c32e840d..688c5c5dd6 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
@@ -69,12 +69,10 @@ import com.google.devtools.build.lib.rules.java.SourcesJavaCompilationArgsProvid
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector.InstrumentationSpec;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.vfs.PathFragment;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 
 /**
@@ -641,14 +639,17 @@ public class AndroidCommon {
     helper.createCompileActionWithInstrumentation(classJar, manifestProtoOutput, genSourceJar,
         outputDepsProto, javaArtifactsBuilder);
 
-    compileTimeDependencyArtifacts =
-        javaCommon.collectCompileTimeDependencyArtifacts(outputDepsProto);
     filesToBuild = filesBuilder.build();
 
     if ((attributes.hasSourceFiles() || attributes.hasSourceJars()) && jar != null) {
       iJar = helper.createCompileTimeJarAction(jar, javaArtifactsBuilder);
     }
-    javaCommon.setJavaCompilationArtifacts(javaArtifactsBuilder.build());
+
+    JavaCompilationArtifacts javaArtifacts = javaArtifactsBuilder.build();
+    compileTimeDependencyArtifacts =
+        javaCommon.collectCompileTimeDependencyArtifacts(
+            javaArtifacts.getCompileTimeDependencyArtifact());
+    javaCommon.setJavaCompilationArtifacts(javaArtifacts);
 
     javaCommon.setClassPathFragment(
         new ClasspathConfiguredFragment(