aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2014-01-16 17:41:56 +0100
committerLorDClockaN <davor@losinj.com>2014-03-28 21:51:06 +0100
commit97abad3f39d624eebd827ae59a5bbdae64056f9a (patch)
tree85b7aa055f52f4fb9b8b07e91e99e8d3f6a5dee3
parenta50c1024213a5c5eaad414b6542bae7bab1d3549 (diff)
Fix dx test 034.
- Test 034 requires that a dex file is dumped in a human readable form even if the dex file does not contain ClassDef. Consequently, the command line behavior is modified to satisfy this requirement. (cherry-pick from commit 64f4aad1e6ef58b29f860b59512ca1a676ac6eb8) Change-Id: Id64b563745db2b22ec98fba9be25413192c07719
-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) {