Check library version and handle library load errors

content/app/android/library_loader_hooks.cc

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 a42474879c6893ec3486ff22f504fc4ae3eef176..7b3f65835e0f5f611e63fe707402196ffb518b0f 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -36,6 +36,7 @@ namespace content {
 
 namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
+std::string library_version_name = "";

[joth, 2013/11/11 20:28:56]

g_library_version_name...

[joth, 2013/11/11 20:28:56]

this is a global C++ object, not allowed by style guide.

It'd be nice if you could just make this a const char*
I think that means the caller should just #include chrome_version_info_posix.h
and pass PRODUCT_VERSION as the param.


Tangent: for webview we'd really like chrome_version_info_posix.h (and VERSION
text file) moved into content/ layer so we can use the same version number in
webview UA in future. Seems like doing that would make this CL much simpler too?
(the GetVersinNumber JNI method would just return PRODUCT_VERSION converted to
java string)

[aberent, 2013/11/13 20:20:52]

I have changed it to a const char *, but I am setting it though a strdup from
the version number in chrome_version_info.cc; since otherwise we have to put
lifetime constraints on the argument to SetVersionName, which I never like if I
can avoid it (this sort of constraint is too easy to break in future code
changes). This only happens once per Chrome run, so the performance cost is
trivial.

I can see some dangers in moving the version number down to content, at the
moment it is the Chrome  version number, will this always be in step with the
content version number? Also consider, for example, Opera. They might want to
use this to check that their C++ library is in step with their JAR, and will
probably use their own versioning scheme which will have nothing to do with
Chrome versions; yet they are, as far as I know, using content unchanged.

 }
 
 bool EnsureJniRegistered(JNIEnv* env) {
@@ -146,4 +147,12 @@ bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+void SetVersionName(const std::string & version_name) {

[joth, 2013/11/11 20:28:56]

not space before &

(and in header)

[aberent, 2013/11/13 20:20:52]

Done.

+  library_version_name = version_name;
+}
+
+jstring GetVersionName(JNIEnv* env, jclass clazz) {
+  return env->NewStringUTF(library_version_name.c_str());
+}
+
 }  // namespace content