| commit | 373c3f33952ff81ba33cc0dd9c68315ed8d7d16b | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Thu Dec 01 17:11:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 01 17:11:49 2016 +0000 |
| tree | a73efcffa991b4a5328318a84a40d1f592370d2d | |
| parent | f5b346a621c96daacd23bbb62f4e84b112916e3e [diff] | |
| parent | cfe8c963dca5eda71b5256efae510b08f593b202 [diff] |
Merge "Revert "Relax conditions to retrieve LV debug info"" am: cfe8c963dc Change-Id: I2aa3a483326ca60c089323b5faa892c940da7682
diff --git a/dx/src/com/android/dx/Version.java b/dx/src/com/android/dx/Version.java index 88225e6..0e77941 100644 --- a/dx/src/com/android/dx/Version.java +++ b/dx/src/com/android/dx/Version.java
@@ -21,5 +21,5 @@ */ public class Version { /** {@code non-null;} version string */ - public static final String VERSION = "1.13"; + public static final String VERSION = "1.12"; }
diff --git a/dx/src/com/android/dx/cf/code/LocalVariableList.java b/dx/src/com/android/dx/cf/code/LocalVariableList.java index 1abd519..4a0bae1 100644 --- a/dx/src/com/android/dx/cf/code/LocalVariableList.java +++ b/dx/src/com/android/dx/cf/code/LocalVariableList.java
@@ -351,8 +351,7 @@ */ public boolean matchesPcAndIndex(int pc, int index) { return (index == this.index) && - // do not check that "pc >= startPc" because startPc may be later than the expected - // pc, if the bytecode has been modified, by Jacoco instrumentation for instance + (pc >= startPc) && (pc < (startPc + length)); }