Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an option for the zip compression level #3410

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add an option for the zip compression level #3410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,19 @@ private static void cmdBuild(CommandLine cli, Config config) {
if (cli.hasOption("use-aapt1")) {
config.useAapt2 = false;
}
if (cli.hasOption("l") ||cli.hasOption("compression-level")) {
try {
int intValue = Integer.parseInt(cli.getOptionValue("l"));
if (intValue < -1 || intValue > 9) {
System.err.println("Compression level must be a value between 0 and 9 or -1 for default.");
System.exit(1);
}
config.zipCompressionLevel = intValue;
} catch (NumberFormatException e) {
System.err.println("Compression level isn't a number.");
System.exit(1);
}
}

if (cli.hasOption("use-aapt1") && cli.hasOption("use-aapt2")) {
System.err.println("You can only use one of --use-aapt1 or --use-aapt2.");
Expand Down Expand Up @@ -471,6 +484,13 @@ private static void _options() {
.desc("Disable crunching of resource files during the build step.")
.build();

Option compressionLevelOption = Option.builder("l")
.longOpt("compression-level")
.desc("Zip file compression level (A number between 0 and 9 or -1 for default)")
.hasArg(true)
.argName("level")
.build();

Option tagOption = Option.builder("t")
.longOpt("tag")
.desc("Tag frameworks using <tag>.")
Expand Down Expand Up @@ -579,6 +599,7 @@ private static void _options() {
allOptions.addOption(aapt2Option);
allOptions.addOption(noCrunchOption);
allOptions.addOption(onlyMainClassesOption);
allOptions.addOption(compressionLevelOption);
}

private static String verbosityHelp() {
Expand Down
3 changes: 2 additions & 1 deletion brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ private void buildUnknownFiles(File outFile) throws AndrolibException {
ZipFile inputFile = new ZipFile(tempFile);
ZipOutputStream actualOutput = new ZipOutputStream(Files.newOutputStream(outFile.toPath()))
) {
actualOutput.setLevel(mConfig.zipCompressionLevel);
copyExistingFiles(inputFile, actualOutput);
copyUnknownFiles(actualOutput, files);
} catch (IOException | BrutException ex) {
Expand Down Expand Up @@ -534,7 +535,7 @@ private void buildApk(File outApk) throws AndrolibException {

private void zipPackage(File apkFile, File rawDir, File assetDir) throws AndrolibException {
try {
ZipUtils.zipFolders(rawDir, apkFile, assetDir, mApkInfo.doNotCompress);
ZipUtils.zipFolders(rawDir, apkFile, assetDir, mApkInfo.doNotCompress, mConfig.zipCompressionLevel);
} catch (IOException | BrutException ex) {
throw new AndrolibException(ex);
}
Expand Down
2 changes: 2 additions & 0 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.io.File;
import java.util.logging.Logger;
import java.util.zip.Deflater;

public class Config {
private static Config instance = null;
Expand Down Expand Up @@ -53,6 +54,7 @@ public class Config {
public boolean updateFiles = false;
public boolean useAapt2 = true;
public boolean noCrunch = false;
public int zipCompressionLevel = Deflater.DEFAULT_COMPRESSION;

// Decode options
public short decodeSources = DECODE_SOURCES_SMALI;
Expand Down
4 changes: 3 additions & 1 deletion brut.j.dir/src/main/java/brut/directory/ZipUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.file.Files;
import java.util.Collection;
import java.util.zip.CRC32;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

Expand All @@ -36,11 +37,12 @@ private ZipUtils() {
// Private constructor for utility class
}

public static void zipFolders(final File folder, final File zip, final File assets, final Collection<String> doNotCompress)
public static void zipFolders(final File folder, final File zip, final File assets, final Collection<String> doNotCompress, final int level)
throws BrutException, IOException {

mDoNotCompress = doNotCompress;
ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(zip.toPath()));
zipOutputStream.setLevel(level);
zipFolders(folder, zipOutputStream);

// We manually set the assets because we need to retain the folder structure
Expand Down