ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-07 10:35:52 +01:00
Code Issues Projects Releases Wiki Activity

removed --original

Browse Source
This commit is contained in:
Connor Tumbleson 2013-03-19 08:52:24 -05:00
parent 69ee710e30
commit e4d506ab27
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java
View File

@ -181,7 +181,6 @@ public class Main {
flags.put("forceBuildAll", false); flags.put("forceBuildAll", false);
flags.put("debug", false); flags.put("debug", false);
flags.put("verbose", false); flags.put("verbose", false);
flags.put("injectOriginal", false);
flags.put("framework", false); flags.put("framework", false);
flags.put("update", false); flags.put("update", false);
@ -206,14 +205,6 @@ public class Main {
} else if ("--frame-path".equals(opt)) { } else if ("--frame-path".equals(opt)) {
i++; i++;
instance.setFrameworkFolder(args[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 { } else {
throw new InvalidArgsError(); throw new InvalidArgsError();
} }

16
brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
View File

@ -189,15 +189,6 @@ public class Androlib {
: (Boolean) meta.get("compressionType")); : (Boolean) meta.get("compressionType"));
mAndRes.setSdkInfo((Map<String, String>) meta.get("sdkInfo")); mAndRes.setSdkInfo((Map<String, String>) 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) { if (outFile == null) {
String outFileName = (String) meta.get("apkFileName"); String outFileName = (String) meta.get("apkFileName");
outFile = new File(appDir, "dist" + File.separator outFile = new File(appDir, "dist" + File.separator
@ -450,13 +441,6 @@ public class Androlib {
} }
mAndRes.aaptPackage(outApk, null, null, new File(appDir, APK_DIRNAME), mAndRes.aaptPackage(outApk, null, null, new File(appDir, APK_DIRNAME),
assetDir, null, flags, mAaptPath); 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 { public void publicizeResources(File arscFile) throws AndrolibException {

1
brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
View File

@ -182,7 +182,6 @@ public class BuildAndDecodeTest {
tmp.put("forceBuildAll", false); tmp.put("forceBuildAll", false);
tmp.put("debug", false); tmp.put("debug", false);
tmp.put("verbose", false); tmp.put("verbose", false);
tmp.put("injectOriginal", false);
tmp.put("framework", false); tmp.put("framework", false);
tmp.put("update", false); tmp.put("update", false);