OSDN Git Service

Add dx option to always generate const-string/jumbo. do not merge.
authorjeffhao <jeffhao@google.com>
Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)
committerXavier Ducrohet <xav@android.com>
Tue, 16 Oct 2012 18:50:55 +0000 (11:50 -0700)
commit69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5
tree152f4e6a2a5321b923fb5a502b6d62bbdd515e42
parent9735865121118f255c4c15183b236f9f30e795f1
Add dx option to always generate const-string/jumbo. do not merge.

This allows large dex files with many strings to be merged properly.

(cherry picked from commit 266f45ff7da18022faf5f77df76c69f8cdad313f)

Change-Id: I5e85346610c4c5280ecdd9e97c63eaef4420642e
dx/src/com/android/dx/command/Main.java
dx/src/com/android/dx/command/dexer/Main.java
dx/src/com/android/dx/dex/DexOptions.java
dx/src/com/android/dx/dex/code/OutputFinisher.java
dx/src/com/android/dx/merge/InstructionTransformer.java