| Index: shell/android/bootstrap.cc
|
| diff --git a/shell/android/bootstrap.cc b/shell/android/bootstrap.cc
|
| index 823258c01a8c16e164d1b4016c3a574ef20e4157..a1c4573b8529418a1ef9c0868b15a023fb3f452f 100644
|
| --- a/shell/android/bootstrap.cc
|
| +++ b/shell/android/bootstrap.cc
|
| @@ -10,6 +10,7 @@
|
| #include "shell/android/run_android_application_function.h"
|
|
|
| namespace mojo {
|
| +namespace shell {
|
|
|
| void Bootstrap(JNIEnv* env,
|
| jobject,
|
| @@ -28,13 +29,14 @@ bool RegisterBootstrapJni(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|
| +} // namespace shell
|
| } // namespace mojo
|
|
|
| JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
| base::android::InitVM(vm);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
|
|
| - if (!mojo::RegisterBootstrapJni(env))
|
| + if (!mojo::shell::RegisterBootstrapJni(env))
|
| return -1;
|
|
|
| return JNI_VERSION_1_4;
|
|
|