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

Side by Side Diff: chrome/browser/android/chrome_entry_point.cc

Issue 2620303004: Remove JNI onload callback vector construction in favour of direct calls. (Closed)
Patch Set: 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/jni_android.h" 5 #include "base/android/jni_android.h"
6 #include "base/android/library_loader/library_loader_hooks.h" 6 #include "base/android/library_loader/library_loader_hooks.h"
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/app/android/chrome_jni_onload.h" 8 #include "chrome/app/android/chrome_jni_onload.h"
9 9
10 namespace { 10 namespace {
11 11
12 bool RegisterJNI(JNIEnv* env) {
13 return true;
14 }
15
16 bool Init() {
17 return true;
18 }
19
20 bool NativeInit() { 12 bool NativeInit() {
21 return android::OnJNIOnLoadInit(base::Bind(&Init)); 13 return android::OnJNIOnLoadInit();
22 } 14 }
23 15
24 } // namespace 16 } // namespace
25 17
26 // This is called by the VM when the shared library is first loaded. 18 // This is called by the VM when the shared library is first loaded.
27 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 19 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
28 if (!android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI))) { 20 if (!android::OnJNIOnLoadRegisterJNI(vm)) {
29 return -1; 21 return -1;
30 } 22 }
31 base::android::SetNativeInitializationHook(NativeInit); 23 base::android::SetNativeInitializationHook(NativeInit);
32 return JNI_VERSION_1_4; 24 return JNI_VERSION_1_4;
33 } 25 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698