Skip to content

GitLab

Commit a7cfa750 authored by Yohann Roussel's avatar Yohann Roussel Committed by android-build-merger
Browse files

Merge "Consider direct references in interface methods" 

am: ea4bfa00

* commit 'ea4bfa00':
  Consider direct references in interface methods
parents df9d8556 ea4bfa00
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dx/src/com/android/multidex/ClassReferenceListBuilder.java
View file @ a7cfa750
......@@ -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++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment