diff options
| author | Calin Juravle <calin@google.com> | 2014-08-12 20:55:20 +0100 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2014-08-15 10:10:09 +0100 |
| commit | c8423521c1d1136c70b153479b7df3bf4fd7fc2a (patch) | |
| tree | f7a0d12391f843d1b1eac1b0227c3237e7da3920 /runtime/java_vm_ext.cc | |
| parent | 02a6317297b8745637b265ab75abbfa685879882 (diff) | |
| download | android_art-c8423521c1d1136c70b153479b7df3bf4fd7fc2a.tar.gz android_art-c8423521c1d1136c70b153479b7df3bf4fd7fc2a.tar.bz2 android_art-c8423521c1d1136c70b153479b7df3bf4fd7fc2a.zip | |
[ART] Move to system/core native bridge library
Some cleanups on the way:
- move NativeBridgeRuntimeCallbacks from a global to a field
- rename native_bridge_library_string to the more suggestive
navtive_bridge_library_path
- clean up imports
Bug: 16884833
Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 9eab3fde13..e085ac245d 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -25,7 +25,7 @@ #include "mirror/art_method.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" -#include "native_bridge.h" +#include "nativebridge/native_bridge.h" #include "java_vm_ext.h" #include "parsed_options.h" #include "ScopedLocalRef.h" @@ -135,7 +135,7 @@ class SharedLibrary { CHECK(NeedsNativeBridge()); uint32_t len = 0; - return NativeBridgeGetTrampoline(handle_, symbol_name.c_str(), shorty, len); + return android::NativeBridgeGetTrampoline(handle_, symbol_name.c_str(), shorty, len); } private: @@ -645,8 +645,8 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, const std::string& path, jobject void* handle = dlopen(path_str, RTLD_LAZY); bool needs_native_bridge = false; if (handle == nullptr) { - if (NativeBridgeIsSupported(path_str)) { - handle = NativeBridgeLoadLibrary(path_str, RTLD_LAZY); + if (android::NativeBridgeIsSupported(path_str)) { + handle = android::NativeBridgeLoadLibrary(path_str, RTLD_LAZY); needs_native_bridge = true; } } |