Split manifest processing out of AndroidResourceProcessor#processResources() as preparation for the ResourceShrinkerAction which does not require it as part of its aapt invocation.

--
MOS_MIGRATED_REVID=114755551

1 files changed, 6 insertions, 7 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
index 70322edb12..a69b02d71b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import java.io.File;
 import java.nio.file.Path;
 
 /**
@@ -38,16 +37,16 @@ class MergedAndroidData {
     this.manifest = manifest;
   }
 
-  public File getResourceDirFile() {
-    return resourceDir.toFile();
+  public Path getResourceDir() {
+    return resourceDir;
   }
 
-  public File getAssetDirFile() {
-    return assetDir != null ? assetDir.toFile() : null;
+  public Path getAssetDir() {
+    return assetDir;
   }
 
-  public File getManifestFile() {
-    return manifest.toFile();
+  public Path getManifest() {
+    return manifest;
   }
 
   public DensityFilteredAndroidData filter(