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

diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
index 6084f6710f..5f8b842859 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
@@ -46,7 +46,7 @@ public class ResourceCompiler {
     private final Path aapt2;
     private final Revision buildToolsVersion;
 
-    public CompileTask(
+    private CompileTask(
         Path file, Path compiledResourcesOut, Path aapt2, Revision buildToolsVersion) {
       this.file = file;
       this.compiledResourcesOut = compiledResourcesOut;
@@ -56,17 +56,16 @@ public class ResourceCompiler {
 
     @Override
     public Path call() throws Exception {
-        logger.fine(
-            new AaptCommandBuilder(aapt2)
-                .forBuildToolsVersion(buildToolsVersion)
-                .forVariantType(VariantType.LIBRARY)
-                .add("compile")
-                .add("-v")
-                .add("--legacy")
-                .add("-o", compiledResourcesOut.toString())
-                .add(file.toString())
-                .execute("Compiling " + file));
-
+      logger.fine(
+          new AaptCommandBuilder(aapt2)
+              .forBuildToolsVersion(buildToolsVersion)
+              .forVariantType(VariantType.LIBRARY)
+              .add("compile")
+              .add("-v")
+              .add("--legacy")
+              .add("-o", compiledResourcesOut.toString())
+              .add(file.toString())
+              .execute("Compiling " + file));
 
       String type = file.getParent().getFileName().toString();
       String filename = file.getFileName().toString();