am 97208a0b: Merge "Added support for version 51 class files in dx"

System Internals / Dalvik - Jean-Philippe Lesot [google.com] - 17 May 2013 02:38 UTC

c5e4f6b am 97208a0b: Merge "Added support for version 51 class files in dx"

dx/src/com/android/dx/cf/code/ByteOps.java | 1 +
dx/src/com/android/dx/cf/code/BytecodeArray.java | 4 +
.../com/android/dx/cf/cst/ConstantPoolParser.java | 93 +++++++++++++-------
dx/src/com/android/dx/cf/cst/ConstantTags.java | 9 ++
.../com/android/dx/cf/direct/DirectClassFile.java | 3 +-
.../class-version-49.0.txt | 2 +-
.../class-version-49.1.txt | 3 +-
.../class-version-49.65535.txt | 3 +-
.../class-version-50.0.txt | 3 +-
.../class-version-50.1.txt | 3 +-
.../class-version-50.65535.txt | 3 +-
.../class-version-51.0.txt | 3 +-
.../class-version-51.1.txt | 26 ++++++
.../class-version-51.65535.txt | 26 ++++++
.../class-version-52.0.txt | 26 ++++++
dx/tests/003-magic-version-access/expected.txt | 79 +++++++++++++++--
dx/tests/003-magic-version-access/run | 9 +-
dx/tests/024-code-bytecode/expected.txt | 73 ++++++++-------
dx/tests/024-code-bytecode/small-class.txt | 5 +-
19 files changed, 275 insertions(+), 99 deletions(-)

Upstream: android.googlesource.com


  • Share