feat: support aapt optimization

brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

@@ -270,6 +270,15 @@ private static void cmdBuild(CommandLine cli, Config config) {
         if (cli.hasOption("nc") || cli.hasOption("no-crunch")) {
             config.noCrunch = true;
         }
+        if (cli.hasOption("srp") || cli.hasOption("shorten-res-paths")) {
+            config.shortenResPaths = true;
+        }
+        if (cli.hasOption("ese") || cli.hasOption("enable-sparse-encoding")) {
+            config.enableSparseEncoding = true;
+        }
+        if (cli.hasOption("crn") || cli.hasOption("collapse-res-names")) {
+            config.collapseResNames = true;
+        }
         if (cli.hasOption("use-aapt1")) {
             config.useAapt2 = false;
         }
@@ -286,8 +295,8 @@ private static void cmdBuild(CommandLine cli, Config config) {
             outFile = null;
         }
 
-        if (config.netSecConf && !config.useAapt2) {
-            System.err.println("-n / --net-sec-conf is only supported with --use-aapt2.");
+        if ((config.netSecConf || config.shortenResPaths || config.enableSparseEncoding || config.collapseResNames) && !config.useAapt2) {
+            System.err.println("-n / --net-sec-conf, -srp / --shorten-res-paths, -ese / --enable-sparse-encoding, -crn / --collapse-res-names are only supported with --use-aapt2.");
             System.exit(1);
         }
 
@@ -481,6 +490,21 @@ private static void _options() {
                 .desc("Disable crunching of resource files during the build step.")
                 .build();
 
+        Option shortenResPathsOption = Option.builder("srp")
+                .longOpt("shorten-res-paths")
+                .desc("Shortens the paths of resources inside the APK.")
+                .build();
+
+        Option enableSparseEncodingOption = Option.builder("ese")
+                .longOpt("enable-sparse-encoding")
+                .desc("Enables encoding of sparse entries using a binary search tree. This option is useful for optimization of APK size but at the cost of resource retrieval performance.")
+                .build();
+
+        Option collapseResNamesOption = Option.builder("crn")
+                .longOpt("collapse-res-names")
+                .desc("Collapses resource names to a single value in the key string pool.")
+                .build();
+
         Option tagOption = Option.builder("t")
                 .longOpt("tag")
                 .desc("Tag frameworks using <tag>.")
@@ -530,6 +554,9 @@ private static void _options() {
             buildOptions.addOption(originalOption);
             buildOptions.addOption(aapt1Option);
             buildOptions.addOption(noCrunchOption);
+            buildOptions.addOption(shortenResPathsOption);
+            buildOptions.addOption(enableSparseEncodingOption);
+            buildOptions.addOption(collapseResNamesOption);
         }
 
         // add global options

brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java

@@ -23,6 +23,9 @@
 import brut.util.OS;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.logging.Logger;
 
@@ -243,6 +246,45 @@ private void invokeAapt2(File apkFile, File manifest, File resDir, File rawDir,
         } catch (BrutException ex) {
             throw new AndrolibException(ex);
         }
+
+        if (mConfig.shortenResPaths || mConfig.enableSparseEncoding || mConfig.collapseResNames) {
+            Path inputFilePath = new File(apkFile.getParent(), apkFile.getName() + ".tmp").toPath();
+            Path apkFilePath = apkFile.toPath();
+            try {
+                Files.copy(apkFilePath, inputFilePath, StandardCopyOption.REPLACE_EXISTING);
+                Files.delete(apkFilePath);
+            } catch (IOException e) {
+                throw new AndrolibException(e);
+            }
+
+            cmd = new ArrayList<>(compileCommand);
+            cmd.add("optimize");
+
+            cmd.add("-o");
+            cmd.add(apkFilePath.toString());
+
+            if (mConfig.shortenResPaths) {
+                cmd.add("--shorten-resource-paths");
+            }
+
+            if (mConfig.enableSparseEncoding) {
+                cmd.add("--enable-sparse-encoding");
+            }
+
+            if (mConfig.collapseResNames) {
+                cmd.add("--collapse-resource-names");
+            }
+
+            cmd.add(inputFilePath.toString());
+
+            try {
+                OS.exec(cmd.toArray(new String[0]));
+                LOGGER.fine("aapt2 optimize command ran: ");
+                LOGGER.fine(cmd.toString());
+            } catch (BrutException ex) {
+                throw new AndrolibException(ex);
+            }
+        }
     }
 
     private void invokeAapt1(File apkFile, File manifest, File resDir, File rawDir, File assetDir, File[] include,

brut.apktool/apktool-lib/src/main/java/brut/androlib/Config.java

@@ -54,6 +54,12 @@ public class Config {
     public boolean useAapt2 = true;
     public boolean noCrunch = false;
 
+    // Optimize options, only supported by aapt2.
+    // see https://developer.android.com/tools/aapt2#optimize_options
+    public boolean shortenResPaths = false;
+    public boolean enableSparseEncoding = false;
+    public boolean collapseResNames = false;
+
     // Decode options
     public short decodeSources = DECODE_SOURCES_SMALI;
     public short decodeResources = DECODE_RESOURCES_FULL;