| Index: content/app/android/library_loader_hooks.cc
|
| diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
|
| index 5498cef784767b6178b2cc4cfe3d7ab2ee70d9c9..db61cb6ac5b80bb7dad01f31c96989ab5b5aaa46 100644
|
| --- a/content/app/android/library_loader_hooks.cc
|
| +++ b/content/app/android/library_loader_hooks.cc
|
| @@ -17,7 +17,9 @@
|
| #include "base/string_tokenizer.h"
|
| #include "base/string_util.h"
|
| #include "base/tracked_objects.h"
|
| -#include "content/app/android/content_jni_registrar.h"
|
| +#include "content/app/android/app_jni_registrar.h"
|
| +#include "content/browser/android/browser_jni_registrar.h"
|
| +#include "content/common/android/common_jni_registrar.h"
|
| #include "content/common/android/command_line.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "media/base/android/media_jni_registrar.h"
|
| @@ -64,7 +66,13 @@ jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
|
| if (!net::android::RegisterJni(env))
|
| return JNI_FALSE;
|
|
|
| - if (!content::android::RegisterJni(env))
|
| + if (!content::android::RegisterCommonJni(env))
|
| + return JNI_FALSE;
|
| +
|
| + if (!content::android::RegisterBrowserJni(env))
|
| + return JNI_FALSE;
|
| +
|
| + if (!content::android::RegisterAppJni(env))
|
| return JNI_FALSE;
|
|
|
| if (!media::RegisterJni(env))
|
|
|