diff options
| author | Davor Bertovic <davor@losinj.com> | 2014-03-30 06:01:33 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@doa.deadnet.net> | 2014-03-30 06:01:33 -0400 |
| commit | 20acc95da26e60e83dab776479d3dd19629fee35 (patch) | |
| tree | 494b6cc74bdea1efb318eb87b3b175ce8820fcca | |
| parent | 636059bc4dfb6d24460b5f646a3039ed2b2db7e3 (diff) | |
| parent | 847b222d87865371590ff7587ae1a7de8823ee47 (diff) | |
Merge "Revert "Fix dx test 034."" into kitkat
| -rw-r--r-- | dx/src/com/android/dx/command/dexer/Main.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java index 947bd4178..d4c396903 100644 --- a/dx/src/com/android/dx/command/dexer/Main.java +++ b/dx/src/com/android/dx/command/dexer/Main.java @@ -272,7 +272,7 @@ public class Main { // this array is null if no classes were defined byte[] outArray = null; - if (!outputDex.isEmpty() || (args.humanOutName != null)) { + if (!outputDex.isEmpty()) { outArray = writeDex(); if (outArray == null) { |