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

Unified Diff: content/app/android/library_loader_hooks.cc

Issue 2784493003: Consolidate JNI registrations for mojo system. (Closed)
Patch Set: Rebase only Created 3 years, 9 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
« no previous file with comments | « content/app/DEPS ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 293cbdedde177b7b06cb7b68868244714c8409fa..7de91d05990070cda10ff505dc2e4dbd14aae85e 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -34,6 +34,7 @@
#include "media/capture/content/android/screen_capture_jni_registrar.h"
#include "media/capture/video/android/capture_jni_registrar.h"
#include "media/midi/midi_jni_registrar.h"
+#include "mojo/android/system/mojo_jni_registrar.h"
#include "net/android/net_jni_registrar.h"
#include "ui/android/ui_android_jni_registrar.h"
#include "ui/base/android/ui_base_jni_registrar.h"
@@ -107,6 +108,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
if (!midi::RegisterJni(env))
return false;
+ if (!mojo::android::RegisterSystemJni(env))
+ return false;
+
if (!ui::RegisterUIAndroidJni(env))
return false;
« no previous file with comments | « content/app/DEPS ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698