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, 4 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
index 6864d1ab68..70dfa8b3b8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
@@ -38,7 +38,7 @@ public class ResourceShrinkerActionBuilder {
   private Artifact resourceFilesZip;
   private Artifact shrunkJar;
   private Artifact proguardMapping;
-  private ResourceContainer primaryResources;
+  private ValidatedAndroidData primaryResources;
   private ResourceDependencies dependencyResources;
   private Artifact resourceApkOut;
   private Artifact shrunkResourcesOut;
@@ -91,10 +91,10 @@ public class ResourceShrinkerActionBuilder {
   }
 
   /**
-   * @param primary The fully processed {@link ResourceContainer} of the resources to be shrunk.
+   * @param primary The fully processed {@link ValidatedAndroidData} of the resources to be shrunk.
    *     Must contain both an R.txt and merged manifest.
    */
-  public ResourceShrinkerActionBuilder withPrimary(ResourceContainer primary) {
+  public ResourceShrinkerActionBuilder withPrimary(ValidatedAndroidData primary) {
     checkNotNull(primary);
     checkNotNull(primary.getManifest());
     checkNotNull(primary.getRTxt());
@@ -245,7 +245,7 @@ public class ResourceShrinkerActionBuilder {
   }
 
   private ImmutableList<String> getResourcePackages(
-      ResourceContainer primaryResources, ResourceDependencies resourceDependencies) {
+      ValidatedAndroidData primaryResources, ResourceDependencies resourceDependencies) {
     ImmutableList.Builder<String> resourcePackages = ImmutableList.builder();
     resourcePackages.add(primaryResources.getJavaPackage());
     for (ValidatedAndroidData resources : resourceDependencies.getResourceContainers()) {