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

Unified Diff: mojo/shell/android/library_loader.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/android/bootstrap.cc ('k') | mojo/shell/android/mojo_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/android/library_loader.cc
diff --git a/mojo/shell/android/library_loader.cc b/mojo/shell/android/library_loader.cc
deleted file mode 100644
index 0a00c8e8769b03000e12cb7d40575e619c5d016b..0000000000000000000000000000000000000000
--- a/mojo/shell/android/library_loader.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/android/base_jni_registrar.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/android/library_loader/library_loader_hooks.h"
-#include "base/logging.h"
-#include "mojo/shell/android/android_handler.h"
-#include "mojo/shell/android/mojo_main.h"
-#include "net/android/net_jni_registrar.h"
-#include "services/native_viewport/platform_viewport_android.h"
-
-namespace {
-
-base::android::RegistrationMethod kMojoRegisteredMethods[] = {
- {"AndroidHandler", mojo::RegisterAndroidHandlerJni},
- {"MojoMain", mojo::RegisterMojoMain},
- {"PlatformViewportAndroid", mojo::PlatformViewportAndroid::Register},
-};
-
-bool RegisterMojoJni(JNIEnv* env) {
- return RegisterNativeMethods(env, kMojoRegisteredMethods,
- arraysize(kMojoRegisteredMethods));
-}
-
-} // namespace
-
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
- base::android::InitVM(vm);
- JNIEnv* env = base::android::AttachCurrentThread();
-
- if (!base::android::RegisterLibraryLoaderEntryHook(env))
- return -1;
-
- if (!base::android::RegisterJni(env))
- return -1;
-
- if (!net::android::RegisterJni(env))
- return -1;
-
- if (!RegisterMojoJni(env))
- return -1;
-
- if (!mojo::RegisterAndroidHandlerJni(env))
- return -1;
-
- return JNI_VERSION_1_4;
-}
« no previous file with comments | « mojo/shell/android/bootstrap.cc ('k') | mojo/shell/android/mojo_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698