Setup for wiring up decoupled data processing in top-level targets

- Expose manifest merging logic from ApplicationManifest
- Use it to reimplement manifest merging in new AndroidManifest class
- Track merged resources zip in ResourceContainer - we shouldn't be forced to
  use hacks to get it
- Clean up return type of ProcessedAndroidData.generateRClass - a ResourceApk
  is the general type used to wrap fully processed data.

RELNOTES: none
PiperOrigin-RevId: 193367162

1 files changed, 3 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
index 916d2804b6..6e8a32a84d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
@@ -432,13 +432,14 @@ public class AndroidResourcesTest extends ResourceTestBase {
             /* dataBindingInfoZip = */ null,
             ResourceDependencies.fromRuleDeps(ruleContext, /* neverlink = */ false));
 
-    ValidatedAndroidResources validated = processedData.generateRClass(ruleContext);
+    ValidatedAndroidData validated =
+        processedData.generateRClass(ruleContext).getValidatedResources();
 
     // An action to generate the R.class file should be registered.
     assertActionArtifacts(
         ruleContext,
         /* inputs = */ ImmutableList.of(rTxt, manifest.getManifest()),
-        /* outputs = */ ImmutableList.of(validated.getClassJar()));
+        /* outputs = */ ImmutableList.of(validated.getJavaClassJar()));
   }
 
   /**