diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-01-16 17:41:56 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-02-02 02:05:21 -0800 |
| commit | 5627e337bbfab398dacb50c7a1ca97783c76f089 (patch) | |
| tree | b3842d734d5413f54b5c10ff5f900012d9edab1f | |
| parent | 653ffbf481aa19c4f6c9a358b33d0d812758dfe5 (diff) | |
| download | android_dalvik-5627e337bbfab398dacb50c7a1ca97783c76f089.tar.gz android_dalvik-5627e337bbfab398dacb50c7a1ca97783c76f089.tar.bz2 android_dalvik-5627e337bbfab398dacb50c7a1ca97783c76f089.zip | |
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.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 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) { |