diff options
| author | 2015-11-12 11:49:06 +0000 | |
|---|---|---|
| committer | 2015-11-12 11:52:42 +0000 | |
| commit | d1ef4362bf799f9f5d50e5edef8433664b503051 (patch) | |
| tree | 59aaa140925efa790f787d5e1caf6d0cafd6ae15 /runtime/class_linker.cc | |
| parent | e4cf5892c2a244034900d49499c071b255571bba (diff) | |
| parent | f32e8327da5dd33abe18662fbca5e584cd047816 (diff) | |
Merge lmp changes into mnc.
Most merge conflicts are due to changes in the string representation.
They have been resolved in favour of "mnc-dev" since we've changed
the string representation there. Other changes relate to the
fact that there are now two jars in libcore (core-oj and core-libart).
Change-Id: I1fcc6e5f8dab8d1954dcddca0493563e7677d433
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 9ca6492fb1..6e7d8e54f1 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -3443,7 +3443,7 @@ ArtMethod* ClassLinker::FindMethodForProxy(mirror::Class* proxy_class, void ClassLinker::CreateProxyConstructor(Handle<mirror::Class> klass, ArtMethod* out) { // Create constructor for Proxy that must initialize the method. - CHECK_EQ(GetClassRoot(kJavaLangReflectProxy)->NumDirectMethods(), 16u); + CHECK_EQ(GetClassRoot(kJavaLangReflectProxy)->NumDirectMethods(), 19u); ArtMethod* proxy_constructor = GetClassRoot(kJavaLangReflectProxy)->GetDirectMethodUnchecked( 2, image_pointer_size_); // Ensure constructor is in dex cache so that we can use the dex cache to look up the overridden |