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

Unified Diff: content/public/android/java/templates/NativeLibraries.template

Issue 59533009: Check library version and handle library load errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix BrowserStartupControllerTest Created 7 years, 1 month 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
Index: content/public/android/java/templates/NativeLibraries.template
diff --git a/content/public/android/java/templates/NativeLibraries.template b/content/public/android/java/templates/NativeLibraries.template
index b6d0dac3f1dd52e4de49f781f1555fc367f82f27..dd710cd01b77c01ed454657532fbc10c70d48ed9 100644
--- a/content/public/android/java/templates/NativeLibraries.template
+++ b/content/public/android/java/templates/NativeLibraries.template
@@ -60,7 +60,16 @@ public class NativeLibraries {
// .apk is being built).
// TODO(cjhopman): This is public since it is referenced by ChromeNativeTestActivity.java
// directly. The two ways of library loading should be refactored into one.
- public static String[] libraries
+ public static final String[] LIBRARIES
#include <native_libraries_array.h>
;
+ // This is the expected version of the 'main' native library, which is the one that
+ // implements the initial set of content JNI functions including
+ // content::nativeGetVersionName()
+ // Note(aberent): This is logically final, but making it final breaks the build, since it
+ // lets other Java components read its value at compile time rather than at run time, hence
+ // reading it from the wrong class file.
+ static String VERSION_NUMBER
+#include <native_libraries_version.h>
+ ;
}

Powered by Google App Engine
This is Rietveld 408576698