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

Unified Diff: blimp/client/app/android/blimp_library_loader.cc

Issue 2132163002: Add BlimpClientContext and factory with real and dummy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-blimp-client-core-public-to-blimp-client
Patch Set: git merge origin/master before CQ for good measure Created 4 years, 5 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 | « blimp/client/app/android/blimp_jni_registrar.cc ('k') | blimp/client/core/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/app/android/blimp_library_loader.cc
diff --git a/blimp/client/app/android/blimp_library_loader.cc b/blimp/client/app/android/blimp_library_loader.cc
index bdb8c730adbc8042364eb3f94732c8f494e0a2c7..c9dd93cfed409f7d2dd561d3800b4b5fe992375a 100644
--- a/blimp/client/app/android/blimp_library_loader.cc
+++ b/blimp/client/app/android/blimp_library_loader.cc
@@ -12,8 +12,9 @@
#include "base/android/library_loader/library_loader_hooks.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
-#include "blimp/client/app/android/blimp_jni_registrar.h"
+#include "blimp/client/app/android/blimp_app_jni_registrar.h"
#include "blimp/client/app/blimp_startup.h"
+#include "blimp/client/public/android/blimp_jni_registrar.h"
#include "jni/BlimpLibraryLoader_jni.h"
#include "net/android/net_jni_registrar.h"
#include "ui/gl/gl_surface.h"
@@ -40,6 +41,9 @@ bool RegisterJni(JNIEnv* env) {
if (!blimp::client::RegisterBlimpJni(env))
return false;
+ if (!blimp::client::RegisterBlimpAppJni(env))
+ return false;
+
return true;
}
« no previous file with comments | « blimp/client/app/android/blimp_jni_registrar.cc ('k') | blimp/client/core/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698