diff options
| author | jeffhao <jeffhao@google.com> | 2011-04-11 12:52:55 -0700 |
|---|---|---|
| committer | jeffhao <jeffhao@google.com> | 2011-04-11 12:52:55 -0700 |
| commit | 56ff6fe7f312dab76c365e5b482a6c32e44caaf7 (patch) | |
| tree | 5b3d9206af7bdd0b73212e0f3c762159aceb06ee /dx | |
| parent | ae9de5bebbb8d03f45992e190d6b4e954f6f4562 (diff) | |
| download | android_dalvik-56ff6fe7f312dab76c365e5b482a6c32e44caaf7.tar.gz android_dalvik-56ff6fe7f312dab76c365e5b482a6c32e44caaf7.tar.bz2 android_dalvik-56ff6fe7f312dab76c365e5b482a6c32e44caaf7.zip | |
Dx block dumper no longer fails on abstract and native methods.
Change-Id: I3bad07a1621c0ef4bc495816b2438cab9401a828
Diffstat (limited to 'dx')
| -rw-r--r-- | dx/src/com/android/dx/command/dump/BlockDumper.java | 5 | ||||
| -rw-r--r-- | dx/src/com/android/dx/command/dump/SsaDumper.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/dx/src/com/android/dx/command/dump/BlockDumper.java b/dx/src/com/android/dx/command/dump/BlockDumper.java index 2326ae487..6919b0967 100644 --- a/dx/src/com/android/dx/command/dump/BlockDumper.java +++ b/dx/src/com/android/dx/command/dump/BlockDumper.java @@ -188,6 +188,11 @@ public class BlockDumper return; } + if ((member.getAccessFlags() & (AccessFlags.ACC_ABSTRACT | + AccessFlags.ACC_NATIVE)) != 0) { + return; + } + ConcreteMethod meth = new ConcreteMethod((Method) member, classFile, true, true); diff --git a/dx/src/com/android/dx/command/dump/SsaDumper.java b/dx/src/com/android/dx/command/dump/SsaDumper.java index de44c8327..0572a300e 100644 --- a/dx/src/com/android/dx/command/dump/SsaDumper.java +++ b/dx/src/com/android/dx/command/dump/SsaDumper.java @@ -90,6 +90,11 @@ public class SsaDumper extends BlockDumper { return; } + if ((member.getAccessFlags() & (AccessFlags.ACC_ABSTRACT | + AccessFlags.ACC_NATIVE)) != 0) { + return; + } + ConcreteMethod meth = new ConcreteMethod((Method) member, classFile, true, true); TranslationAdvice advice = DexTranslationAdvice.THE_ONE; |