Fix bugs in incremental dx.
The compaction code used to merge a dex with itself. This caused
problems because annotations would be duplicated. Now the dex is
merged with an empty dex. I've changed the section default from
-1 to 0 to make the empty dex trivial to construct.
It also had a correctness problem where we were using the wrong
offsets when merging indexed values. Move the offsets out of the
loop so they aren't reset.
Change-Id: Ibcf24de8f96c2c525ca2e2ac44550239e3cf689e
http://b/3447216
4 files changed