diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-17 11:09:10 -0700 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2014-08-14 12:08:15 +0100 |
| commit | 20ae1d77463d1c3f206eac8d541124b4555464de (patch) | |
| tree | 2d6ee2f380b553a968993b397d83c64b97b28d80 /runtime/jni_internal.cc | |
| parent | 7e9cdbbc14c015028d4b239a09c5af33ffc2087c (diff) | |
| download | art-20ae1d77463d1c3f206eac8d541124b4555464de.tar.gz art-20ae1d77463d1c3f206eac8d541124b4555464de.tar.bz2 art-20ae1d77463d1c3f206eac8d541124b4555464de.zip | |
Clean up native bridge
(partially cherry picked from commit
68d8b42ddec39ec0174162d90d4abaa004d1983e)
Change-Id: I85813e97d73b1b331646dd0e880108dfbfe80f69
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index f158463db8..e3341ce57e 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -448,7 +448,7 @@ class SharedLibrary { if (m != nullptr) { shorty = m->GetShorty(&len); } - return NativeBridge::GetTrampoline(handle_, symbol_name.c_str(), shorty, len); + return NativeBridgeGetTrampoline(handle_, symbol_name.c_str(), shorty, len); } void VisitRoots(RootCallback* visitor, void* arg) { @@ -3309,8 +3309,8 @@ bool JavaVMExt::LoadNativeLibrary(const std::string& path, void* handle = dlopen(path_str, RTLD_LAZY); bool needs_native_bridge = false; if (handle == nullptr) { - if (NativeBridge::IsSupported(path_str)) { - handle = NativeBridge::LoadLibrary(path_str, RTLD_LAZY); + if (NativeBridgeIsSupported(path_str)) { + handle = NativeBridgeLoadLibrary(path_str, RTLD_LAZY); needs_native_bridge = true; } } |