| Index: content/shell/android/linker_test_apk/chromium_linker_test_android.cc
|
| diff --git a/content/shell/android/linker_test_apk/chromium_linker_test_android.cc b/content/shell/android/linker_test_apk/chromium_linker_test_android.cc
|
| index 5173128dc8a8ff5f81316a48a87ef0e56716e99e..7b12c36828a1b8b51681bdc3e028c2fb98510d12 100644
|
| --- a/content/shell/android/linker_test_apk/chromium_linker_test_android.cc
|
| +++ b/content/shell/android/linker_test_apk/chromium_linker_test_android.cc
|
| @@ -11,7 +11,6 @@
|
| #include "content/public/app/android_library_loader_hooks.h"
|
| #include "content/public/app/content_main.h"
|
| #include "content/public/browser/android/compositor.h"
|
| -#include "content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.h"
|
| #include "content/shell/android/shell_jni_registrar.h"
|
| #include "content/shell/app/shell_main_delegate.h"
|
|
|
| @@ -23,17 +22,11 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
| base::android::InitVM(vm);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
|
|
| - if (!base::android::RegisterLibraryLoaderEntryHook(env))
|
| - return -1;
|
| -
|
| // To be called only from the UI thread. If loading the library is done on
|
| // a separate thread, this should be moved elsewhere.
|
| if (!content::android::RegisterShellJni(env))
|
| return -1;
|
|
|
| - if (!content::RegisterLinkerTestsJni(env))
|
| - return -1;
|
| -
|
| content::Compositor::Initialize();
|
| content::SetContentMainDelegate(new content::ShellMainDelegate());
|
| return JNI_VERSION_1_4;
|
|
|