OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
822a722
)
Make dex merging stateless. do not merge.
author
Xavier Ducrohet
<xav@android.com>
Mon, 11 Jun 2012 22:17:31 +0000
(15:17 -0700)
committer
Xavier Ducrohet
<xav@android.com>
Fri, 31 Aug 2012 00:34:17 +0000
(17:34 -0700)
This is required to run dx in Eclipse which doesn't unload the dx
library after each run.
(cherry-pick of
7aa5ce7e990dc3766eba97cd0932b62e4de21503
.)
(cherry picked from commit
5e90165d5918f18aec0964bc475f4064e9143599
)
Change-Id: Id5818f516539d13423b7cef4b2b1af30a9686b45
dx/src/com/android/dx/command/dexer/Main.java
patch
|
blob
|
history
diff --git
a/dx/src/com/android/dx/command/dexer/Main.java
b/dx/src/com/android/dx/command/dexer/Main.java
index
d127550
..
80ddbd0
100644
(file)
--- 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;
}