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

Side by Side Diff: net/test/android/net_test_entry_point.cc

Issue 2620303004: Remove JNI onload callback vector construction in favour of direct calls. (Closed)
Patch Set: rebase compile errors Created 3 years, 10 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 | « mojo/android/javatests/init_library.cc ('k') | net/test/android/net_test_jni_onload.h » ('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 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 "net/test/android/net_test_jni_onload.h" 6 #include "net/test/android/net_test_jni_onload.h"
7 7
8 // This is called by the VM when the shared library is first loaded. 8 // This is called by the VM when the shared library is first loaded.
9 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 9 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
10 if (!net::test::OnJNIOnLoadRegisterJNI(vm) || !net::test::OnJNIOnLoadInit()) { 10 base::android::InitVM(vm);
11 JNIEnv* env = base::android::AttachCurrentThread();
12 if (!net::test::OnJNIOnLoadRegisterJNI(env) ||
13 !net::test::OnJNIOnLoadInit()) {
11 return -1; 14 return -1;
12 } 15 }
13 return JNI_VERSION_1_4; 16 return JNI_VERSION_1_4;
14 } 17 }
OLDNEW
« no previous file with comments | « mojo/android/javatests/init_library.cc ('k') | net/test/android/net_test_jni_onload.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698