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

Side by Side Diff: content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc

Issue 2501193003: Selectively perform JNI registration in render processes on Android. (Closed)
Patch Set: Conditionally register JNI based on process type. Created 3 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/base_jni_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/public/app/content_jni_onload.h" 8 #include "content/public/app/content_jni_onload.h"
9 #include "content/public/app/content_main.h" 9 #include "content/public/app/content_main.h"
10 #include "content/shell/android/shell_jni_registrar.h" 10 #include "content/shell/android/shell_jni_registrar.h"
(...skipping 11 matching lines...) Expand all
22 bool Init() { 22 bool Init() {
23 content::SetContentMainDelegate(new content::ShellMainDelegate()); 23 content::SetContentMainDelegate(new content::ShellMainDelegate());
24 return true; 24 return true;
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 29
30 // This is called by the VM when the shared library is first loaded. 30 // This is called by the VM when the shared library is first loaded.
31 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 31 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
32 base::android::InitVM(vm);
33 base::android::InitJniRegistrationType(base::android::AttachCurrentThread(),
34 false);
32 std::vector<base::android::RegisterCallback> register_callbacks; 35 std::vector<base::android::RegisterCallback> register_callbacks;
33 register_callbacks.push_back(base::Bind(&RegisterJNI)); 36 register_callbacks.push_back(base::Bind(&RegisterJNI));
34 std::vector<base::android::InitCallback> init_callbacks; 37 std::vector<base::android::InitCallback> init_callbacks;
35 init_callbacks.push_back(base::Bind(&Init)); 38 init_callbacks.push_back(base::Bind(&Init));
36 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 39 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
37 !content::android::OnJNIOnLoadInit(init_callbacks)) { 40 !content::android::OnJNIOnLoadInit(init_callbacks)) {
38 return -1; 41 return -1;
39 } 42 }
40 return JNI_VERSION_1_4; 43 return JNI_VERSION_1_4;
41 } 44 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698