| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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" | |
| 10 #include "base/bind.h" | 9 #include "base/bind.h" |
| 11 #include "base/macros.h" | 10 #include "base/macros.h" |
| 12 #include "net/android/net_jni_registrar.h" | 11 #include "remoting/host/android/remoting_host_jni_registrar.h" |
| 13 #include "remoting/client/jni/remoting_jni_registrar.h" | |
| 14 #include "ui/gfx/android/gfx_jni_registrar.h" | |
| 15 | 12 |
| 16 namespace { | 13 namespace { |
| 17 | 14 |
| 18 base::android::RegistrationMethod kRemotingRegisteredMethods[] = { | 15 base::android::RegistrationMethod kRemotingRegisteredMethods[] = { |
| 19 {"base", base::android::RegisterJni}, | 16 {"base", base::android::RegisterJni}, |
| 20 {"gfx", gfx::android::RegisterJni}, | 17 {"remoting_host", remoting::RegisterJni}, |
| 21 {"net", net::android::RegisterJni}, | |
| 22 {"remoting", remoting::RegisterJni}, | |
| 23 }; | 18 }; |
| 24 | 19 |
| 25 bool RegisterJNI(JNIEnv* env) { | 20 bool RegisterJNI(JNIEnv* env) { |
| 26 return base::android::RegisterNativeMethods(env, | 21 return base::android::RegisterNativeMethods( |
| 27 kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods)); | 22 env, kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods)); |
| 28 } | 23 } |
| 29 | 24 |
| 30 } // namespace | 25 } // namespace |
| 31 | 26 |
| 32 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 27 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 33 std::vector<base::android::RegisterCallback> register_callbacks; | 28 std::vector<base::android::RegisterCallback> register_callbacks; |
| 34 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 29 register_callbacks.push_back(base::Bind(&RegisterJNI)); |
| 35 std::vector<base::android::InitCallback> init_callbacks; | 30 std::vector<base::android::InitCallback> init_callbacks; |
| 36 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | 31 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || |
| 37 !base::android::OnJNIOnLoadInit(init_callbacks)) { | 32 !base::android::OnJNIOnLoadInit(init_callbacks)) { |
| 38 return -1; | 33 return -1; |
| 39 } | 34 } |
| 40 return JNI_VERSION_1_4; | 35 return JNI_VERSION_1_4; |
| 41 } | 36 } |
| OLD | NEW |