Check library version and handle library load errors

content/app/android/library_loader_hooks.cc

 // Copyright (c) 2012 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 <string.h>

[Yaron, 2013/11/16 00:10:26]

Nit: should go after the header include for this file.

[Yaron, 2013/11/18 19:07:59]

bump

+
 #include "content/public/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 14 matching lines @@
 #include "net/android/net_jni_registrar.h"
 #include "ui/base/android/ui_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 
 namespace content {
 
 namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
+const char * g_library_version_number = "";

[Yaron, 2013/11/16 00:10:26]

nit: unnecessary space

[aberent, 2013/11/18 15:11:37]

Done.

 }
 
 bool EnsureJniRegistered(JNIEnv* env) {
   static bool g_jni_init_done = false;
 
   if (!g_jni_init_done) {
     if (!base::android::RegisterJni(env))
       return false;
 
     if (!gfx::android::RegisterJni(env))
@@ skipping 90 matching lines @@
   }
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   // We need the AtExitManager to be created at the very beginning.
   g_at_exit_manager = new base::AtExitManager();
 
   return RegisterNativesImpl(env);
 }
 
+void SetVersionNumber(const char* version_number) {
+  g_library_version_number = strdup(version_number);
+}
+
+jstring GetVersionNumber(JNIEnv* env, jclass clazz) {
+  return env->NewStringUTF(g_library_version_number);
+}
+
 }  // namespace content