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, 12 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidData.java b/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidData.java
index a6b6490f76..3848eb3a8d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidData.java
@@ -47,4 +47,16 @@ public interface ValidatedAndroidData extends CompiledMergableAndroidData {
 
   @VisibleForTesting
   Artifact getApk();
+
+  /**
+   * Gets an Artifact containing a zip of merged resources.
+   *
+   * <p>If assets were processed together with resources, the zip will also contain merged assets.
+   *
+   * @deprecated This artifact is produced by an often-expensive action and should not be used if
+   *     another option is available. Furthermore, it will be replaced by flat files once we
+   *     completely move to aapt2.
+   */
+  @Deprecated
+  Artifact getMergedResources();
 }