Merge "Make dex merging stateless."android-sdk-adt_r20tools_r20

1 files changed, 4 insertions, 0 deletions

diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index d127550a6..80ddbd0a2 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -186,6 +186,9 @@ public class Main {
         // Reset the error/warning count to start fresh.
         warnings = 0;
         errors = 0;
+        // empty the list, so that  tools that load dx and keep it around
+        // for multiple runs don't reuse older buffers.
+        libraryDexBuffers.clear();
 
         args = arguments;
         args.makeOptionsObjects();
@@ -297,6 +300,7 @@ public class Main {
             DexBuffer ab = new DexMerger(a, b, CollisionPolicy.FAIL).merge();
             outArray = ab.getBytes();
         }
+
         return outArray;
     }