diff options
| author | 2012-02-29 09:03:00 -0800 | |
|---|---|---|
| committer | 2012-02-29 09:03:00 -0800 | |
| commit | efbdefbf4f48990769fc98857a605dac62f3e29c (patch) | |
| tree | 6f2318aa80cb9698532e04b1f8c74a3ac289ac99 /src/class_linker.cc | |
| parent | ba80a64fdb97a4c641c777d26ca3efb4c70da144 (diff) | |
| parent | 0d6de041f3777f6d403c831e8db32040804bcdf5 (diff) | |
Merge "Fix JNI stub dlsym regression" into dalvik-dev
Diffstat (limited to 'src/class_linker.cc')
| -rw-r--r-- | src/class_linker.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/class_linker.cc b/src/class_linker.cc index f6d555d8cc..700174eff5 100644 --- a/src/class_linker.cc +++ b/src/class_linker.cc @@ -1398,7 +1398,8 @@ void LinkCode(SirtRef<Method>& method, const OatFile::OatClass* oat_class, uint3 if (method->IsStatic() && !method->IsConstructor()) { // For static methods excluding the class initializer, install the trampoline method->SetCode(runtime->GetResolutionStubArray(Runtime::kStaticMethod)->GetData()); - } else if (method->IsNative()) { + } + if (method->IsNative()) { // unregistering restores the dlsym lookup stub method->UnregisterNative(Thread::Current()); } |