GitLab

Make DexMerger take the largest dex-file version that is given.

Bug: 27538761
Bug: 27809626

Change-Id: Iddca99477f5edbfc7b9cf3b3deda37fd84e4eeda

Bug: 27538761
Bug: 27809626
Change-Id: I79b2bdfc8194dc210bc1299b0544f82b2af735b0

Change-Id: I6bc13ac430609db5c7463180c63fd7e58de3983d

Declared method and field descriptors elements are direct references and
those direct references must be considered directly because their
only corresponding constant pool entry is a CONSTANT_Utf8_info.

Bug: 27158750

Change-Id: I1cbf5a269a6616bcbc706afa61d543c8710ad2f8

Change-Id: I16e1123afd69002b377432b85dcb578678f72d49

bug=27156344

Change-Id: I20ce9388d48d022eb2f85e597b2c7cc68a26434d

If a class file cannot be parsed, print the error message and context
(including file name), and omit the stack trace unless --debug is
enabled.

Bug: 25075831
Change-Id: I0a790a5b329640acb7185dbf94408b21dd17de8c

- There are now 2 differents messages for bad magic number and
  unsupported version
- The version number is printed in decimal instead of hexadecimal.

Bug: 25075831
Change-Id: I37227c65779c432d6d699a27c54d97766f8ff550

Previously ClassReferenceListBuilder was considering only CstMethodRef
and ignoring CstInterfaceMethodRef.

Bug: 26823834
Change-Id: I5f016feb7ba91c9ab6abcd9edd9ecd7a27aa3ef9

am: 50b3c25c

* commit '50b3c25c':
  DX: Fix tests 115, 119, 125

am: 47455657

* commit '47455657':
  DX: Fix tests 029, 033, 116, 117

Fix the junit tests.

Bug: 25567784
Change-Id: I17df7644b938c55a7a6b0fd39be535c59b71b0f7

These tests run a runtime. Move them to ART. Also update 115 and 119
for junit changes.

Bug: 25567784
Change-Id: I45ed0f70d979437ae8a94bf1b7f164dd9bb46da7

am: 0a0ee368

* commit '0a0ee368':
  Handle ACONST_NULL multidimensional arrays.

Instead of inferring that an AALOAD following an ACONST_NULL means that
the null constant was of type Object[] and the result is of type Object,
infer that the result is also null and don't infer the type of the null
constant. Note that this is also incorrect but it doesn't matter since
the code will always throw a NullPointerException at runtime.

This removes dx's reliance on javac bug
https://bugs.openjdk.java.net/browse/JDK-7040592

Bug: 25075957

(cherry picked from commit 54576c56)

Change-Id: I021a6686cfc298ada50df04fd6b345f4ad838229

* commit 'f8ed7d3f':
  Fixes unnecessary multi-merge steps.

Changes merging from quadratic in the number of classes to linear.
This has a tremendous speed up while merging many dexes at the same time.
A sample test (iosched app) with 29 dexes goes from 6 seconds to 1.

Change-Id: Iff02a0dc44d098b0878e88d18f5f4083804a6495

* commit '32b6d346':
  Remove dmtracedump from dalvik.

Bug: 24700673
Change-Id: I8eb883c7b7e60d60c3ca88d0b9bfd5f1588724e7

* commit 'ca2f25be':
  dmtracedump: fix compilation warnings

* commit '4a19f1aa':
  dexdump is present even on user builds.

* commit '0be69b52':
  dexdump is present even on user builds.

So it ought to be in /system/bin, not all alone in /system/xbin.

Change-Id: Ic30210e448f0f4c90aea5b7921e84d371bd01e5f

Change-Id: I7e788138a11923bea61aae26db9f3ed63176e993

* commit '4dc3ff9f':
  Fixes unnecessary multi-merge steps.