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

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

Issue 1466463004: Aura on Android: Fix link errors when building content_unittests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@platform_window_mus
Patch Set: Created 5 years, 1 month 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 | « no previous file | content/public/test/content_test_suite_base.cc » ('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 0d36b85924e6cc001eddc9c9bd1248298bf5617d..9e45b0c90628abad2234b47b38e46f01f69a1e0d 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -62,11 +62,6 @@ bool EnsureJniRegistered(JNIEnv* env) {
if (!ui::events::android::RegisterJni(env))
return false;
-#if !defined(USE_AURA)
- if (!ui::shell_dialogs::RegisterJni(env))
- return false;
-#endif
-
if (!content::android::RegisterCommonJni(env))
return false;
@@ -85,8 +80,13 @@ bool EnsureJniRegistered(JNIEnv* env) {
if (!media::midi::RegisterJni(env))
return false;
+#if !defined(USE_AURA)
+ if (!ui::shell_dialogs::RegisterJni(env))
+ return false;
+
if (!ui::RegisterUIAndroidJni(env))
return false;
+#endif
g_jni_init_done = true;
}
« no previous file with comments | « no previous file | content/public/test/content_test_suite_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698