| OLD | NEW |
| 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 } |
| OLD | NEW |