Action for resource shrinking with aapt2

Introduces the ResourcesZip class to more easily handle processing merged resources.

RELNOTES: None
PiperOrigin-RevId: 169622715

1 files changed, 3 insertions, 6 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 4380a0b69b..4ec9ebcf92 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -437,7 +437,7 @@ public class AndroidResourceProcessingAction {
       }
 
       if (options.packageType == VariantType.LIBRARY) {
-        resourceProcessor.writeDummyManifestForAapt(dummyManifest, options.packageForR);
+        AndroidResourceProcessor.writeDummyManifestForAapt(dummyManifest, options.packageForR);
         processedData =
             new MergedAndroidData(
                 processedData.getResourceDir(), processedData.getAssetDir(), dummyManifest);
@@ -488,11 +488,8 @@ public class AndroidResourceProcessingAction {
             generatedSources, options.rOutput, VariantType.LIBRARY == options.packageType);
       }
       if (options.resourcesOutput != null) {
-        AndroidResourceOutputs.createResourcesZip(
-            processedData.getResourceDir(),
-            processedData.getAssetDir(),
-            options.resourcesOutput,
-            false /* compress */);
+        ResourcesZip.from(processedData.getResourceDir(), processedData.getAssetDir())
+            .writeTo(options.resourcesOutput, false /* compress */);
       }
       logger.fine(
           String.format("Packaging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));