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

Side by Side Diff: mojo/android/javatests/init_library.cc

Issue 2919553004: Remove base::android::OnJNIOnLoadRegisterJNI() (Closed)
Patch Set: remove unused Callback Created 3 years, 6 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
« no previous file with comments | « content/app/android/content_jni_onload.cc ('k') | net/test/android/net_test_jni_onload.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/base_jni_onload.h" 5 #include "base/android/base_jni_onload.h"
6 #include "base/android/base_jni_registrar.h" 6 #include "base/android/base_jni_registrar.h"
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/android/library_loader/library_loader_hooks.h" 9 #include "base/android/library_loader/library_loader_hooks.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 22 matching lines...) Expand all
33 33
34 mojo::edk::Init(); 34 mojo::edk::Init();
35 return true; 35 return true;
36 } 36 }
37 37
38 } // namespace 38 } // namespace
39 39
40 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 40 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
41 base::android::InitVM(vm); 41 base::android::InitVM(vm);
42 JNIEnv* env = base::android::AttachCurrentThread(); 42 JNIEnv* env = base::android::AttachCurrentThread();
43 if (!base::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || 43 if (!RegisterJNI(env) || !NativeInit()) {
44 !NativeInit()) {
45 return -1; 44 return -1;
46 } 45 }
47 return JNI_VERSION_1_4; 46 return JNI_VERSION_1_4;
48 } 47 }
OLDNEW
« no previous file with comments | « content/app/android/content_jni_onload.cc ('k') | net/test/android/net_test_jni_onload.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698