OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_registrar.h" | 5 #include "base/android/base_jni_registrar.h" |
6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
7 #include "base/android/jni_registrar.h" | 7 #include "base/android/jni_registrar.h" |
8 #include "base/android/library_loader/library_loader_hooks.h" | 8 #include "base/android/library_loader/library_loader_hooks.h" |
9 #include "mojo/android/javatests/mojo_test_case.h" | 9 #include "mojo/android/javatests/mojo_test_case.h" |
| 10 #include "mojo/android/javatests/validation_test_util.h" |
10 #include "mojo/android/system/core_impl.h" | 11 #include "mojo/android/system/core_impl.h" |
11 | 12 |
12 namespace { | 13 namespace { |
13 | 14 |
14 base::android::RegistrationMethod kMojoRegisteredMethods[] = { | 15 base::android::RegistrationMethod kMojoRegisteredMethods[] = { |
15 { "CoreImpl", mojo::android::RegisterCoreImpl }, | 16 { "CoreImpl", mojo::android::RegisterCoreImpl }, |
16 { "MojoTestCase", mojo::android::RegisterMojoTestCase }, | 17 { "MojoTestCase", mojo::android::RegisterMojoTestCase }, |
| 18 { "ValidationTestUtil", mojo::android::RegisterValidationTestUtil }, |
17 }; | 19 }; |
18 | 20 |
19 bool RegisterMojoJni(JNIEnv* env) { | 21 bool RegisterMojoJni(JNIEnv* env) { |
20 return RegisterNativeMethods(env, kMojoRegisteredMethods, | 22 return RegisterNativeMethods(env, kMojoRegisteredMethods, |
21 arraysize(kMojoRegisteredMethods)); | 23 arraysize(kMojoRegisteredMethods)); |
22 } | 24 } |
23 | 25 |
24 } // namespace | 26 } // namespace |
25 | 27 |
26 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 28 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
27 base::android::InitVM(vm); | 29 base::android::InitVM(vm); |
28 JNIEnv* env = base::android::AttachCurrentThread(); | 30 JNIEnv* env = base::android::AttachCurrentThread(); |
29 | 31 |
30 if (!base::android::RegisterLibraryLoaderEntryHook(env)) | 32 if (!base::android::RegisterLibraryLoaderEntryHook(env)) |
31 return -1; | 33 return -1; |
32 | 34 |
33 if (!base::android::RegisterJni(env)) | 35 if (!base::android::RegisterJni(env)) |
34 return -1; | 36 return -1; |
35 | 37 |
36 if (!RegisterMojoJni(env)) | 38 if (!RegisterMojoJni(env)) |
37 return -1; | 39 return -1; |
38 | 40 |
39 return JNI_VERSION_1_4; | 41 return JNI_VERSION_1_4; |
40 } | 42 } |
OLD | NEW |