diff options
| author | Yohann Roussel <yroussel@google.com> | 2016-01-28 17:20:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-28 17:20:32 +0000 |
| commit | a7cfa7509d7e6dfbb5cb1a94dc64fe920f1b189f (patch) | |
| tree | cc9128a3de00201acd5842d15c77bf983ecd8566 | |
| parent | df9d8556dfeeb38e857728b3193cbdf7297f3b11 (diff) | |
| parent | ea4bfa000802809bb63f7534d3b44afb70391bb8 (diff) | |
| download | dalvik-a7cfa7509d7e6dfbb5cb1a94dc64fe920f1b189f.tar.gz | |
Merge "Consider direct references in interface methods"
am: ea4bfa0008
* commit 'ea4bfa000802809bb63f7534d3b44afb70391bb8':
Consider direct references in interface methods
| -rw-r--r-- | dx/src/com/android/multidex/ClassReferenceListBuilder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dx/src/com/android/multidex/ClassReferenceListBuilder.java b/dx/src/com/android/multidex/ClassReferenceListBuilder.java index 8218693c9..f014708d9 100644 --- a/dx/src/com/android/multidex/ClassReferenceListBuilder.java +++ b/dx/src/com/android/multidex/ClassReferenceListBuilder.java @@ -19,6 +19,7 @@ package com.android.multidex; import com.android.dx.cf.direct.DirectClassFile; import com.android.dx.rop.cst.Constant; import com.android.dx.rop.cst.ConstantPool; +import com.android.dx.rop.cst.CstBaseMethodRef; import com.android.dx.rop.cst.CstFieldRef; import com.android.dx.rop.cst.CstMethodRef; import com.android.dx.rop.cst.CstType; @@ -103,8 +104,8 @@ public class ClassReferenceListBuilder { checkDescriptor(((CstType) constant).getClassType()); } else if (constant instanceof CstFieldRef) { checkDescriptor(((CstFieldRef) constant).getType()); - } else if (constant instanceof CstMethodRef) { - Prototype proto = ((CstMethodRef) constant).getPrototype(); + } else if (constant instanceof CstBaseMethodRef) { + Prototype proto = ((CstBaseMethodRef) constant).getPrototype(); checkDescriptor(proto.getReturnType()); StdTypeList args = proto.getParameterTypes(); for (int i = 0; i < args.size(); i++) { |