Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Side by Side Diff: shell/android/bootstrap.cc

Issue 775343004: Move //mojo/shell to //shell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "shell/android/run_android_application_function.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 13
14 void Bootstrap(JNIEnv* env, 14 void Bootstrap(JNIEnv* env,
15 jobject, 15 jobject,
16 jobject j_context, 16 jobject j_context,
17 jstring j_native_library_path, 17 jstring j_native_library_path,
18 jint j_handle, 18 jint j_handle,
19 jlong j_run_application_ptr) { 19 jlong j_run_application_ptr) {
20 base::FilePath app_path( 20 base::FilePath app_path(
(...skipping 11 matching lines...) Expand all
32 32
33 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 33 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
34 base::android::InitVM(vm); 34 base::android::InitVM(vm);
35 JNIEnv* env = base::android::AttachCurrentThread(); 35 JNIEnv* env = base::android::AttachCurrentThread();
36 36
37 if (!mojo::RegisterBootstrapJni(env)) 37 if (!mojo::RegisterBootstrapJni(env))
38 return -1; 38 return -1;
39 39
40 return JNI_VERSION_1_4; 40 return JNI_VERSION_1_4;
41 } 41 }
OLDNEW
« no previous file with comments | « shell/android/apk/src/org/chromium/mojo_shell_apk/MojoShellApplication.java ('k') | shell/android/library_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698