Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Side by Side Diff: content/shell/android/linker_test_apk/chromium_linker_test_android.cc

Issue 147533004: Remove unneeded JNI registrations. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix android webview build issues. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/jni_android.h" 5 #include "base/android/jni_android.h"
6 #include "base/android/jni_registrar.h" 6 #include "base/android/jni_registrar.h"
7 #include "base/android/library_loader/library_loader_hooks.h" 7 #include "base/android/library_loader/library_loader_hooks.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "content/public/app/android_library_loader_hooks.h" 11 #include "content/public/app/android_library_loader_hooks.h"
12 #include "content/public/app/content_main.h" 12 #include "content/public/app/content_main.h"
13 #include "content/public/browser/android/compositor.h" 13 #include "content/public/browser/android/compositor.h"
14 #include "content/shell/android/linker_test_apk/chromium_linker_test_linker_test s.h"
15 #include "content/shell/android/shell_jni_registrar.h" 14 #include "content/shell/android/shell_jni_registrar.h"
16 #include "content/shell/app/shell_main_delegate.h" 15 #include "content/shell/app/shell_main_delegate.h"
17 16
18 // This is called by the VM when the shared library is first loaded. 17 // This is called by the VM when the shared library is first loaded.
19 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 18 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
20 19
21 base::android::SetLibraryLoadedHook(&content::LibraryLoaded); 20 base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
22 21
23 base::android::InitVM(vm); 22 base::android::InitVM(vm);
24 JNIEnv* env = base::android::AttachCurrentThread(); 23 JNIEnv* env = base::android::AttachCurrentThread();
25 24
26 if (!base::android::RegisterLibraryLoaderEntryHook(env))
27 return -1;
28
29 // To be called only from the UI thread. If loading the library is done on 25 // To be called only from the UI thread. If loading the library is done on
30 // a separate thread, this should be moved elsewhere. 26 // a separate thread, this should be moved elsewhere.
31 if (!content::android::RegisterShellJni(env)) 27 if (!content::android::RegisterShellJni(env))
32 return -1; 28 return -1;
33 29
34 if (!content::RegisterLinkerTestsJni(env))
35 return -1;
36
37 content::Compositor::Initialize(); 30 content::Compositor::Initialize();
38 content::SetContentMainDelegate(new content::ShellMainDelegate()); 31 content::SetContentMainDelegate(new content::ShellMainDelegate());
39 return JNI_VERSION_1_4; 32 return JNI_VERSION_1_4;
40 } 33 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698