| 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 "base/bind.h" | 6 #include "net/test/android/net_test_jni_onload.h" |
| 7 #include "chrome/app/android/chrome_jni_onload.h" | |
| 8 | |
| 9 namespace { | |
| 10 | |
| 11 bool RegisterJNI(JNIEnv* env) { | |
| 12 return true; | |
| 13 } | |
| 14 | |
| 15 bool Init() { | |
| 16 return true; | |
| 17 } | |
| 18 | |
| 19 } // namespace | |
| 20 | 7 |
| 21 // 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. |
| 22 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 9 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 23 if (!chrome::android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI)) || | 10 if (!net::test::OnJNIOnLoadRegisterJNI(vm) || |
| 24 !chrome::android::OnJNIOnLoadInit(base::Bind(&Init))) { | 11 !net::test::OnJNIOnLoadInit()) { |
| 25 return -1; | 12 return -1; |
| 26 } | 13 } |
| 27 return JNI_VERSION_1_4; | 14 return JNI_VERSION_1_4; |
| 28 } | 15 } |
| OLD | NEW |