Check library version and handle library load errors

content/public/app/android_library_loader_hooks.h

Index: content/public/app/android_library_loader_hooks.h
diff --git a/content/public/app/android_library_loader_hooks.h b/content/public/app/android_library_loader_hooks.h
index a980005ee5697b1ccd6ce3ac6d909e6b61538d76..b0239eec198e17965e6493eafdf14dac16935f4a 100644
--- a/content/public/app/android_library_loader_hooks.h
+++ b/content/public/app/android_library_loader_hooks.h
@@ -7,6 +7,8 @@
 
 #include <jni.h>
 
+#include <string>

[joth, 2013/11/18 19:45:23]

nit - remove

[aberent, 2013/11/25 18:31:47]

Done.

+
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 
@@ -23,6 +25,11 @@ CONTENT_EXPORT bool RegisterLibraryLoaderEntryHook(JNIEnv* env);
 // during JNI_OnLoad.
 CONTENT_EXPORT bool EnsureJniRegistered(JNIEnv* env);
 
+// Pass the version name to Content. This used to check that the library version
+// matches the version expected by Java before completing JNI registration.
+// Note: argument must remain valid at least until library loading is complete.
+CONTENT_EXPORT void SetVersionNumber(const char* version_number);
+
 // Call on exit to delete the AtExitManager which OnLibraryLoadedOnUIThread
 // created.
 CONTENT_EXPORT void LibraryLoaderExitHook();