Fix JNI stub dlsym regression
Linking code for a static native method requires both a trampoline and a
dlsym resolution stub.
Change-Id: I707f8e641895df18e6c0966db2034303a3ab3b35
diff --git a/src/class_linker.cc b/src/class_linker.cc
index f6d555d..700174e 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1398,7 +1398,8 @@
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());
}