diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java index 179af105..b228a42c 100644 --- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java +++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java @@ -181,7 +181,6 @@ public class Main { flags.put("forceBuildAll", false); flags.put("debug", false); flags.put("verbose", false); - flags.put("injectOriginal", false); flags.put("framework", false); flags.put("update", false); @@ -206,14 +205,6 @@ public class Main { } else if ("--frame-path".equals(opt)) { i++; instance.setFrameworkFolder(args[i]); - } else if ("-o".equals(opt) || "--original".equals(opt)) { - if (args.length >= 4) { - throw new InvalidArgsError(); - } else { - flags.put("injectOriginal", true); - mOrigApk = new ExtFile(args[i + 1]); - skip = 1; - } } else { throw new InvalidArgsError(); } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index e619c162..1bc096e3 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -189,15 +189,6 @@ public class Androlib { : (Boolean) meta.get("compressionType")); mAndRes.setSdkInfo((Map) meta.get("sdkInfo")); - // check the orig apk - if (flags.get("injectOriginal")) { - if (!origApk.isFile() || !origApk.canRead()) { - throw new InFileNotFoundException(); - } else { - mOrigApkFile = origApk; - } - } - if (outFile == null) { String outFileName = (String) meta.get("apkFileName"); outFile = new File(appDir, "dist" + File.separator @@ -450,13 +441,6 @@ public class Androlib { } mAndRes.aaptPackage(outApk, null, null, new File(appDir, APK_DIRNAME), assetDir, null, flags, mAaptPath); - - // retain signature - // aapt r (remove) - // aapt a (add) - if (flags.get("injectOriginal")) { - LOGGER.info("Injecting contents isn't ready yet. Sorry :("); - } } public void publicizeResources(File arscFile) throws AndrolibException { diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java index 19831387..e177407d 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java @@ -182,7 +182,6 @@ public class BuildAndDecodeTest { tmp.put("forceBuildAll", false); tmp.put("debug", false); tmp.put("verbose", false); - tmp.put("injectOriginal", false); tmp.put("framework", false); tmp.put("update", false);