From 6554881606e300a44c4b1deeb4fda8acd2d7e2a0 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Fri, 6 Apr 2018 14:59:10 -0400 Subject: [PATCH] Revert "options: deprecate "doNotCompress", introduce "noCompressAssets"" This reverts commit cb6b6dfda813c377b4406b12a8b78fbb79afdda5. --- .../apktool-lib/src/main/java/brut/androlib/ApkOptions.java | 3 --- .../apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java index 8eec9205..0a81ef07 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java @@ -28,10 +28,7 @@ public class ApkOptions { public boolean isFramework = false; public boolean resourcesAreCompressed = false; public boolean useAapt2 = false; - - @Deprecated public Collection doNotCompress; - public Collection noCompressAssets; public String frameworkFolderLocation = null; public String frameworkTag = null; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java index 9921090e..7da11d4d 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java @@ -37,10 +37,7 @@ public class MetaInfo { public boolean sharedLibrary; public boolean sparseResources; public Map unknownFiles; - - @Deprecated public Collection doNotCompress; - public Collection noCompressAssets; private static Yaml getYaml() { DumperOptions options = new DumperOptions();