diff options
author | Elliott Hughes <enh@google.com> | 2012-06-11 16:41:26 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-11 16:41:26 -0700 |
commit | effc95cb732d8d5453930e647240a1665b6dc71a (patch) | |
tree | 4632c70117cfb79476152c694504f1a307f12761 /dx | |
parent | a9ac3a9d1f8de71bcdc39d1f4827c04a952a0c29 (diff) | |
parent | 5e90165d5918f18aec0964bc475f4064e9143599 (diff) | |
download | android_dalvik-effc95cb732d8d5453930e647240a1665b6dc71a.tar.gz android_dalvik-effc95cb732d8d5453930e647240a1665b6dc71a.tar.bz2 android_dalvik-effc95cb732d8d5453930e647240a1665b6dc71a.zip |
Merge "Make dex merging stateless."
Diffstat (limited to 'dx')
-rw-r--r-- | dx/src/com/android/dx/command/dexer/Main.java | 4 |
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; } |