Ability to stop using ResourceContainer in various actions

Now that we support decoupled asset and resource processing in the basic
pipeline, we can also support it in these actions.

ResourceShrinker actions, by design, does not use assets, so the change is
trivial.

For the AarGenerator, things get a bit more complex:

- Simplify needlessly complex code around AAR generation
- Move around special resource processing to generate AAR inputs in the case
  where there are no local resources to go next to normal resource processing
- Also, clean up that code
- ResourceApk wrapper class has some fields which are non-null even in the case
  where resources are inherited
- Always pass assets and resources seperately to the AarGenerator action

RELNOTES: none
PiperOrigin-RevId: 193355790

1 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
index 3bf61dbbec..a6e8b5883b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
@@ -135,13 +135,22 @@ public final class ApplicationManifest {
    */
   public static ApplicationManifest generatedManifest(RuleContext ruleContext)
       throws RuleErrorException {
+    return fromExplicitManifest(
+        ruleContext, generateManifest(ruleContext, AndroidCommon.getJavaPackage(ruleContext)));
+  }
+
+  /**
+   * Creates an action to generate an empty manifest file with a specific package name.
+   *
+   * @return an artifact for the generated manifest
+   */
+  static Artifact generateManifest(RuleContext ruleContext, String manifestPackage) {
     Artifact generatedManifest =
         ruleContext.getUniqueDirectoryArtifact(
             ruleContext.getRule().getName() + "_generated",
             PathFragment.create("AndroidManifest.xml"),
             ruleContext.getBinOrGenfilesDirectory());
 
-    String manifestPackage = AndroidCommon.getJavaPackage(ruleContext);
     String contents =
         Joiner.on("\n")
             .join(
@@ -156,7 +165,7 @@ public final class ApplicationManifest {
         .registerAction(
             FileWriteAction.create(
                 ruleContext, generatedManifest, contents, /*makeExecutable=*/ false));
-    return fromExplicitManifest(ruleContext, generatedManifest);
+    return generatedManifest;
   }
 
   private static ImmutableMap<String, String> getManifestValues(RuleContext context) {