Projects >> platform_dalvik >>9910d7e004c7452a6a1b934f19dc87bb4d61d8bc

Chunk
Conflicting content 
                    dontOptimizeListFile = parser.getLastValue();
                } else if (parser.isArg("--keep-classes")) {
                    keepClassesInJar = true;
<<<<<<< HEAD
                } else if (arg.startsWith("--output=")) {
                    outName = arg.substring(arg.indexOf('=') + 1);
                    if (FileUtils.hasArchiveSuffix(outName)) {
=======
                } else if (parser.isArg("--output=")) {
                    outName = parser.getLastValue();
                    if (outName.endsWith(".zip") ||
                            outName.endsWith(".jar") ||
                            outName.endsWith(".apk")) {
>>>>>>> 72b7c6179a6ab44b60735f9c4411faa5fce9649d
                        jarOutput = true;
                    } else if (outName.endsWith(".dex") ||
                               outName.equals("-")) {
Solution content 
                    dontOptimizeListFile = parser.getLastValue();
                } else if (parser.isArg("--keep-classes")) {
                    keepClassesInJar = true;
                } else if (parser.isArg("--output=")) {
                    outName = parser.getLastValue();
                    if (FileUtils.hasArchiveSuffix(outName)) {
                        jarOutput = true;
                    } else if (outName.endsWith(".dex") ||
                               outName.equals("-")) {
File
Main.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
                } else if (parser.isArg("--dump-method=")) {
                    methodToDump = parser.getLastValue();
                    jarOutput = false;
<<<<<<< HEAD
                } else if (arg.startsWith("--target-api=")) {
                    arg = arg.substring(arg.indexOf('=') + 1);
                    int value;
                    try {
                        value = Integer.parseInt(arg);
                    } catch (NumberFormatException ex) {
                        value = -1;
                    }
                    if (value < 1) {
                        System.err.println("improper target-api option: " + arg);
                        throw new UsageException();
                    }
                    // TODO: this currently causes confusion for unbundled apps.
                    // What we call 'target' is what developers call 'min', so
                    // they're accidentally turning on new opcodes.
                    // targetApiLevel = value;
                } else if (arg.startsWith("--positions=")) {
                    String pstr = arg.substring(arg.indexOf('=') + 1).intern();
=======
                } else if (parser.isArg("--positions=")) {
                    String pstr = parser.getLastValue().intern();
>>>>>>> 72b7c6179a6ab44b60735f9c4411faa5fce9649d
                    if (pstr == "none") {
                        positionInfo = PositionList.NONE;
                    } else if (pstr == "important") {
Solution content 
                } else if (parser.isArg("--dump-method=")) {
                    methodToDump = parser.getLastValue();
                    jarOutput = false;
                } else if (parser.isArg("--target-api=")) {
                    String arg = parser.getLastValue();
                    int value;
                    try {
                        value = Integer.parseInt(arg);
                    } catch (NumberFormatException ex) {
                        value = -1;
                    }
                    if (value < 1) {
                        System.err.println("improper target-api option: " + arg);
                        throw new UsageException();
                    }
                    // TODO: this currently causes confusion for unbundled apps.
                    // What we call 'target' is what developers call 'min', so
                    // they're accidentally turning on new opcodes.
                    // targetApiLevel = value;
                } else if (parser.isArg("--positions=")) {
                    String pstr = parser.getLastValue().intern();
                    if (pstr == "none") {
                        positionInfo = PositionList.NONE;
                    } else if (pstr == "important") {
File
Main.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation
Try statement
Variable
Chunk
Conflicting content 
                    }
                } else if (parser.isArg("--no-locals")) {
                    localInfo = false;
<<<<<<< HEAD
                } else if (arg.startsWith("--num-threads=")) {
                    arg = arg.substring(arg.indexOf('=') + 1);
                    numThreads = Integer.parseInt(arg);
                } else if (arg.equals("--incremental")) {
                    incremental = true;
=======
                } else if (parser.isArg("--num-threads=")) {
                    numThreads = Integer.parseInt(parser.getLastValue());
>>>>>>> 72b7c6179a6ab44b60735f9c4411faa5fce9649d
                } else {
                    System.err.println("unknown option: " + parser.getCurrent());
                    throw new UsageException();
Solution content 
                    }
                } else if (parser.isArg("--no-locals")) {
                    localInfo = false;
                } else if (parser.isArg("--num-threads=")) {
                    numThreads = Integer.parseInt(parser.getLastValue());
                } else if (parser.isArg("--incremental")) {
                    incremental = true;
                } else {
                    System.err.println("unknown option: " + parser.getCurrent());
                    throw new UsageException();
File
Main.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Variable