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

Side by Side Diff: testing/android/native_test/native_test_jni_onload.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 | « remoting/client/jni/remoting_jni_onload.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_onload.h" 5 #include "base/android/base_jni_onload.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/android/library_loader/library_loader_hooks.h" 7 #include "base/android/library_loader/library_loader_hooks.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "testing/android/native_test/native_test_launcher.h" 9 #include "testing/android/native_test/native_test_launcher.h"
10 10
(...skipping 10 matching lines...) Expand all
21 return true; 21 return true;
22 } 22 }
23 23
24 } // namespace 24 } // namespace
25 25
26 26
27 // This is called by the VM when the shared library is first loaded. 27 // This is called by the VM when the shared library is first loaded.
28 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 28 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
29 base::android::InitVM(vm); 29 base::android::InitVM(vm);
30 JNIEnv* env = base::android::AttachCurrentThread(); 30 JNIEnv* env = base::android::AttachCurrentThread();
31 if (!base::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || 31 if (!RegisterJNI(env) || !NativeInit()) {
32 !NativeInit()) {
33 return -1; 32 return -1;
34 } 33 }
35 return JNI_VERSION_1_4; 34 return JNI_VERSION_1_4;
36 } 35 }
OLDNEW
« no previous file with comments | « remoting/client/jni/remoting_jni_onload.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698