X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fshell%2Fandroid%2Fshell_library_loader.cc;h=142d9efcd45c4d574fd1d96d8edba0c94ed9937f;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=599e42177795038565709abc762694d0db244e27;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/content/shell/android/shell_library_loader.cc b/src/content/shell/android/shell_library_loader.cc
index 599e421..142d9ef 100644
--- 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