| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/jni_utils.h" | 9 #include "base/android/jni_utils.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 bool RegisterJNI(JNIEnv* env) { | 25 bool RegisterJNI(JNIEnv* env) { |
| 26 return base::android::RegisterNativeMethods( | 26 return base::android::RegisterNativeMethods( |
| 27 env, kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods)); | 27 env, kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods)); |
| 28 } | 28 } |
| 29 | 29 |
| 30 } // namespace | 30 } // namespace |
| 31 | 31 |
| 32 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 32 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 33 base::android::InitVM(vm); | 33 base::android::InitVM(vm); |
| 34 JNIEnv* env = base::android::AttachCurrentThread(); | 34 JNIEnv* env = base::android::AttachCurrentThread(); |
| 35 if (!base::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || | 35 if (!RegisterJNI(env) || !base::android::OnJNIOnLoadInit()) { |
| 36 !base::android::OnJNIOnLoadInit()) { | |
| 37 return -1; | 36 return -1; |
| 38 } | 37 } |
| 39 return JNI_VERSION_1_4; | 38 return JNI_VERSION_1_4; |
| 40 } | 39 } |
| OLD | NEW |