| 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/jni_android.h" | 5 #include "base/android/jni_android.h" |
| 6 #include "base/android/jni_string.h" | 6 #include "base/android/jni_string.h" |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "jni/Bootstrap_jni.h" | 9 #include "jni/Bootstrap_jni.h" |
| 10 #include "mojo/shell/android/run_android_application_function.h" | 10 #include "mojo/runner/android/run_android_application_function.h" |
| 11 | 11 |
| 12 namespace mojo { | 12 namespace mojo { |
| 13 namespace shell { | 13 namespace shell { |
| 14 | 14 |
| 15 void Bootstrap(JNIEnv* env, | 15 void Bootstrap(JNIEnv* env, |
| 16 jobject, | 16 jobject, |
| 17 jobject j_context, | 17 jobject j_context, |
| 18 jstring j_native_library_path, | 18 jstring j_native_library_path, |
| 19 jint j_handle, | 19 jint j_handle, |
| 20 jlong j_run_application_ptr) { | 20 jlong j_run_application_ptr) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 35 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 36 base::android::InitVM(vm); | 36 base::android::InitVM(vm); |
| 37 JNIEnv* env = base::android::AttachCurrentThread(); | 37 JNIEnv* env = base::android::AttachCurrentThread(); |
| 38 | 38 |
| 39 if (!mojo::shell::RegisterBootstrapJni(env)) | 39 if (!mojo::shell::RegisterBootstrapJni(env)) |
| 40 return -1; | 40 return -1; |
| 41 | 41 |
| 42 return JNI_VERSION_1_4; | 42 return JNI_VERSION_1_4; |
| 43 } | 43 } |
| OLD | NEW |