aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavor Bertovic <davor@losinj.com>2014-04-01 11:19:11 -0400
committerDavor Bertovic <davor@losinj.com>2014-04-01 11:19:11 -0400
commit4b33b8bf8b1f2b5ac4cfcf1f40f11400109f91fa (patch)
tree85b7aa055f52f4fb9b8b07e91e99e8d3f6a5dee3
parent847b222d87865371590ff7587ae1a7de8823ee47 (diff)
Revert "Revert "Fix dx test 034.""
This reverts commit 847b222d87865371590ff7587ae1a7de8823ee47. Change-Id: I5587003b33c674465af1643e484de9a589eae1d7
-rw-r--r--dx/src/com/android/dx/command/dexer/Main.java2
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 d4c396903..947bd4178 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) {