Clean up R class generation

Remove R class generation from AndroidCommon and instead invoke it just after
resource processing. This is much more intuitive, behaves the same, and will
make it easier to call into R class generation on the new pipeline.

Also, clean up some dead code (including newly-dead code) from AndroidCommon.

RELNOTES: none
PiperOrigin-RevId: 193345190

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidManifest.java
index f862e7f339..3aea312672 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ProcessedAndroidManifest.java
@@ -32,4 +32,11 @@ public class ProcessedAndroidManifest extends StampedAndroidManifest {
   public boolean equals(Object object) {
     return (object instanceof ProcessedAndroidManifest) && super.equals(object);
   }
+
+  public static ProcessedAndroidManifest from(ResourceContainer resourceContainer) {
+    return new ProcessedAndroidManifest(
+        resourceContainer.getManifest(),
+        resourceContainer.getJavaPackage(),
+        resourceContainer.isManifestExported());
+  }
 }