fixes issue 469, added -m / --match-original

fixes xml output not having newline after xml declaration
This commit is contained in:
Connor Tumbleson
2013-06-12 10:04:28 -05:00
parent 9f03d7d35c
commit 832978a549
5 changed files with 49 additions and 8 deletions

View File

@ -141,6 +141,9 @@ public class Main {
if (cli.hasOption("p") || cli.hasOption("frame-path")) {
decoder.setFrameworkDir(cli.getOptionValue("p"));
}
if (cli.hasOption("m") || cli.hasOption("match-original")) {
decoder.setAnalysisMode(true, false);
}
if (cli.hasOption("o") || cli.hasOption("output")) {
decoder.setOutDir(new File(cli.getOptionValue("o")));
} else {
@ -281,6 +284,10 @@ public class Main {
.withDescription("Decode in debug mode. Check project page for more info.")
.create("d");
Option analysisOption = OptionBuilder.withLongOpt("-match-original")
.withDescription("Keeps files to closest to original as possible. Prevents rebuild.")
.create("m");
Option debugLinePrefix = OptionBuilder.withLongOpt("debug-line-prefix")
.withDescription("Smali line prefix when decoding in debug mode. Default is \"a=0;// \".")
.hasArg(true)
@ -368,6 +375,7 @@ public class Main {
DecodeOptions.addOption(debugDecOption);
DecodeOptions.addOption(noDbgOption);
DecodeOptions.addOption(keepResOption);
DecodeOptions.addOption(analysisOption);
BuildOptions.addOption(debugBuiOption);
BuildOptions.addOption(aaptOption);
@ -408,6 +416,7 @@ public class Main {
for (Object op : frameOptions.getOptions()) {
allOptions.addOption((Option)op);
}
allOptions.addOption(analysisOption);
allOptions.addOption(debugLinePrefix);
allOptions.addOption(debugDecOption);
allOptions.addOption(noDbgOption);