diff options
| author | Davor Bertovic <davor@losinj.com> | 2014-04-01 11:19:14 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@doa.deadnet.net> | 2014-04-01 11:19:14 -0400 |
| commit | 59eb39d88149d474e11972d52deced559564c3fe (patch) | |
| tree | 1de45c20b4d83078652539870bfcd7935c4901cd | |
| parent | 626bcc98f2c4c1ca94934010cc72935c29476b03 (diff) | |
| parent | 4b33b8bf8b1f2b5ac4cfcf1f40f11400109f91fa (diff) | |
Merge "Revert "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 ab6d2f788..653b9bce4 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()) { + if (!outputDex.isEmpty() || (args.humanOutName != null)) { outArray = writeDex(); if (outArray == null) { |