commit 83a8a3b50e274b4f01a4c81a63940c58f939b934
author Jesse Wilson <jessewilson@google.com> Wed Aug 31 15:00:57 2011 -0400
committer Jesse Wilson <jessewilson@google.com> Wed Aug 31 15:00:57 2011 -0400
tree fa41ff190c3cbf12fa274ff7a8574b56ca5eebac
parent 798048412112aae95e15783b78a722f8a9020b5c

Fix a corner-case dex merging bug.

When doing a null merge (merging a dex file with an empty file) word-alignment
means that the output may be two bytes longer than the input. Always include the
rounded-up length in the bytes allocated to a section.

com.android.dx.util.DexException: Section limit 669894 exceeded by type list
	at com.android.dx.io.DexBuffer$Section.ensureCapacity(DexBuffer.java:541)
	at com.android.dx.io.DexBuffer$Section.writeShort(DexBuffer.java:574)
	at com.android.dx.io.DexBuffer$Section.writeTypeList(DexBuffer.java:636)
	at com.android.dx.merge.DexMerger$3.write(DexMerger.java:439)
	at com.android.dx.merge.DexMerger$3.write(DexMerger.java:424)
	at com.android.dx.merge.DexMerger$IdMerger.mergeUnsorted(DexMerger.java:321)

Change-Id: I67b81ba8c837b0307e313f4012a051b022b25db2