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

Unified Diff: chrome/browser/android/chrome_entry_point.cc

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 months 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
Index: chrome/browser/android/chrome_entry_point.cc
diff --git a/chrome/browser/android/chrome_entry_point.cc b/chrome/browser/android/chrome_entry_point.cc
new file mode 100644
index 0000000000000000000000000000000000000000..be1956e680b0ae99bd27699268a8ebdcadbbaea3
--- /dev/null
+++ b/chrome/browser/android/chrome_entry_point.cc
@@ -0,0 +1,15 @@
+// Copyright 2015 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/jni_android.h"
+#include "chrome/browser/android/chrome_staging_jni_onload.h"
+
+// This is called by the VM when the shared library is first loaded.
+JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+ if (!chrome::android::OnJNIOnLoadRegisterJNI(vm) ||
+ !chrome::android::OnJNIOnLoadInit()) {
+ return -1;
+ }
+ return JNI_VERSION_1_4;
+}
« no previous file with comments | « chrome/browser/android/bookmark/edit_bookmark_helper.cc ('k') | chrome/browser/android/chrome_main_delegate_staging_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698