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

diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
index 31c837805d..e3a1d9535f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
@@ -206,17 +206,17 @@ public class AarGeneratorAction {
       zipOut.write(Files.readAllBytes(classes));
       zipOut.closeEntry();
 
-      Files.walkFileTree(data.getResourceDirFile().toPath(),
-          new ZipDirectoryWriter(zipOut, data.getResourceDirFile().toPath(), "res"));
+      Files.walkFileTree(data.getResourceDir(),
+          new ZipDirectoryWriter(zipOut, data.getResourceDir(), "res"));
 
       ZipEntry r = new ZipEntry("R.txt");
       zipOut.putNextEntry(r);
       zipOut.write(Files.readAllBytes(rtxt));
       zipOut.closeEntry();
 
-      if (data.getAssetDirFile().exists() && data.getAssetDirFile().list().length > 0) {
-        Files.walkFileTree(data.getAssetDirFile().toPath(),
-            new ZipDirectoryWriter(zipOut, data.getAssetDirFile().toPath(), "assets"));
+      if (Files.exists(data.getAssetDir()) && data.getAssetDir().toFile().list().length > 0) {
+        Files.walkFileTree(data.getAssetDir(),
+            new ZipDirectoryWriter(zipOut, data.getAssetDir(), "assets"));
       }
     }
     aar.toFile().setLastModified(EPOCH);