| Index: mojo/shell/standalone/android/bootstrap.cc
|
| diff --git a/mojo/runner/android/bootstrap.cc b/mojo/shell/standalone/android/bootstrap.cc
|
| similarity index 88%
|
| rename from mojo/runner/android/bootstrap.cc
|
| rename to mojo/shell/standalone/android/bootstrap.cc
|
| index 4f1b39490aa2951e1ff89a6061010dd3541a4cde..39b6901d57a255de987c94c8dc88a9ad512cc0d1 100644
|
| --- a/mojo/runner/android/bootstrap.cc
|
| +++ b/mojo/shell/standalone/android/bootstrap.cc
|
| @@ -7,10 +7,10 @@
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| #include "jni/Bootstrap_jni.h"
|
| -#include "mojo/runner/android/run_android_application_function.h"
|
| +#include "mojo/shell/standalone/android/run_android_application_function.h"
|
|
|
| namespace mojo {
|
| -namespace runner {
|
| +namespace shell {
|
|
|
| void Bootstrap(JNIEnv* env,
|
| const JavaParamRef<jobject>&,
|
| @@ -29,14 +29,14 @@ bool RegisterBootstrapJni(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|
| -} // namespace runner
|
| +} // namespace shell
|
| } // namespace mojo
|
|
|
| JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
| base::android::InitVM(vm);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
|
|
| - if (!mojo::runner::RegisterBootstrapJni(env))
|
| + if (!mojo::shell::RegisterBootstrapJni(env))
|
| return -1;
|
|
|
| return JNI_VERSION_1_4;
|
|
|