OSDN Git Service

Support debug info in dexmerge. do not merge.
authorElliott Hughes <enh@google.com>
Thu, 7 Jun 2012 23:47:38 +0000 (16:47 -0700)
committerXavier Ducrohet <xav@android.com>
Fri, 31 Aug 2012 00:33:51 +0000 (17:33 -0700)
commit822a722b412511cd1322d9d32107981c009c470c
treebf2c99a6a3fe4f2b1a51fdcb89799e2cb918218e
parent51801371a9b0f829303d326a2300518177dde3e8
Support debug info in dexmerge. do not merge.

Bug: 4090053

Signed-off-by: Jesse Wilson <jesse@swank.ca>
(cherry picked from commit bc23c4f3ebaefebb3f1be7732767631f91e165ea)

Change-Id: Ic59d3cc1866c2e4328e406f22cb23fc08d5c6d91
dx/src/com/android/dx/io/DexBuffer.java
dx/src/com/android/dx/merge/DexMerger.java