git.osdn.net Git - android-x86/dalvik.git/commit

(root) / android-x86 / dalvik.git / commit

author	Jesse Wilson <jessewilson@google.com>
	Wed, 16 Mar 2011 21:22:51 +0000 (14:22 -0700)
committer	Jesse Wilson <jessewilson@google.com>
	Thu, 17 Mar 2011 00:47:38 +0000 (17:47 -0700)
commit	bd3dba4346223593ac6033a3d2a7d8ec6f20738b
tree	173c2479689385298ff6fd1e05038d5f784e1387	tree \| snapshot
parent	1b4822ecb93021e6273c92093f78dcb6ccc0cf91	commit \| diff

Don't emit multiple copies of annotations when merging dex files.

This change requires all annotations to be loaded into memory
so they can be sorted. There does not appear to be a required
order to the annotations in .dex files. Loading annotations also
requires loading encoded values, which makes this into a large
refactoring.

Change-Id: Ib7e2656c595018be4e9936eb84a22f1c1de56750
http://b/4090053

21 files changed:

dx/src/com/android/dx/command/findusages/FindUsages.java		diff \| blob \| history
dx/src/com/android/dx/dex/file/DebugInfoDecoder.java		diff \| blob \| history
dx/src/com/android/dx/io/Annotation.java	[new file with mode: 0644]	blob
dx/src/com/android/dx/io/Code.java		diff \| blob \| history
dx/src/com/android/dx/io/DexBuffer.java		diff \| blob \| history
dx/src/com/android/dx/io/EncodedValue.java	[new file with mode: 0644]	blob
dx/src/com/android/dx/io/EncodedValueReader.java		diff \| blob \| history
dx/src/com/android/dx/io/FieldId.java		diff \| blob \| history
dx/src/com/android/dx/io/MethodId.java		diff \| blob \| history
dx/src/com/android/dx/merge/DexMerger.java		diff \| blob \| history
dx/src/com/android/dx/merge/EncodedValueTransformer.java	[deleted file]	blob \| history
dx/src/com/android/dx/merge/IndexMap.java		diff \| blob \| history
dx/src/com/android/dx/util/ByteArrayAnnotatedOutput.java		diff \| blob \| history
dx/src/com/android/dx/util/ByteArrayByteInput.java	[new file with mode: 0644]	blob
dx/src/com/android/dx/util/ByteInput.java	[new file with mode: 0644]	blob
dx/src/com/android/dx/util/ByteOutput.java	[new file with mode: 0644]	blob
dx/src/com/android/dx/util/Leb128Utils.java		diff \| blob \| history
dx/src/com/android/dx/util/Mutf8.java		diff \| blob \| history
dx/src/com/android/dx/util/Output.java		diff \| blob \| history
dx/tests/116-leb128/com/android/dx/util/Leb128UtilsTest.java		diff \| blob \| history
dx/tests/117-modified-utf8/com/android/dx/util/Mutf8Test.java		diff \| blob \| history

dalvik

RSS Atom

About OSDN

Find Software

Develop Software

Help