Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / shell / android / shell_library_loader.cc

diff --git a/src/content/shell/android/shell_library_loader.cc b/src/content/shell/android/shell_library_loader.cc
index 599e421..142d9ef 100644 (file)
--- a/src/content/shell/android/shell_library_loader.cc
+++ b/src/content/shell/android/shell_library_loader.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
+#include "base/android/library_loader/library_loader_hooks.h"
 #include "base/basictypes.h"
 #include "base/debug/debugger.h"
 #include "base/logging.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/android/compositor.h"
@@ -15,10 +16,13 @@
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+
+  base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
+
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
 
-  if (!content::RegisterLibraryLoaderEntryHook(env))
+  if (!base::android::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
   // To be called only from the UI thread.  If loading the library is done on