Rollback of commit a58f245a4b40c0ef961b1f30d96b16a9349711c3.

*** Reason for rollback ***

broke over 100k targets, in the depot, see []

*** Original change description ***

Move library R generation to a separate action, ensuring the merging happens
off the java critical path.

--
PiperOrigin-RevId: 150602545
MOS_MIGRATED_REVID=150602545

1 files changed, 5 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
index dc84ee5dc5..3d7886d368 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
@@ -144,11 +144,10 @@ public class AndroidResourceMergingActionBuilder {
     ResourceContainerConverter.convertDependencies(
         dependencies, builder, inputs, RESOURCE_CONTAINER_TO_ARG, RESOURCE_CONTAINER_TO_ARTIFACTS);
 
+    Preconditions.checkNotNull(classJarOut);
     List<Artifact> outs = new ArrayList<>();
-    if (classJarOut != null) {
-      builder.addExecPath("--classJarOutput", classJarOut);
-      outs.add(classJarOut);
-    }
+    builder.addExecPath("--classJarOutput", classJarOut);
+    outs.add(classJarOut);
 
     if (mergedResourcesOut != null) {
       builder.addExecPath("--resourcesOutput", mergedResourcesOut);
@@ -188,11 +187,8 @@ public class AndroidResourceMergingActionBuilder {
             .build(context));
 
     // Return the full set of processed transitive dependencies.
-    ResourceContainer.Builder result = primary.toBuilder();
-    if (classJarOut != null) {
-      // ensure the classJar is propgated if it exists. Otherwise, AndroidCommon tries to make it.
-      result.setJavaClassJar(classJarOut);
-    }
+    ResourceContainer.Builder result = primary.toBuilder()
+        .setJavaClassJar(classJarOut);
     if (manifestOut != null) {
       result.setManifest(manifestOut);
     }