Check library version and handle library load errors

This CL modifies the build to incorporate the expected C++ library version
in the Java code. This is then checked when the library is loaded, to
make sure that the C++ and Java builds match.

This CL also implements error handling when library loads fail or the
loaded version doesn't match the expected version.

BUG=311644

Review URL: https://codereview.chromium.org/59533009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237779 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java b/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java
index 04db536..c01bea5 100644
--- a/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java
+++ b/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java
@@ -16,5 +16,10 @@ public class NativeLibraries {
     // This is the list of native libraries to load. In the normal chromium build, this would be
     // automatically generated.
     // TODO(torne, cjhopman): Use a generated file for this.
-    static String[] libraries = { "webviewchromium" };
+    static final String[] LIBRARIES = { "webviewchromium" };
+    // This should match the version name string returned by the native library.
+    // TODO(aberent) The Webview native library currently returns an empty string; change this
+    // to a string generated at compile time, and incorporate that string in a generated
+    // replacement for this file.
+    static String VERSION_NUMBER = "";
 }