base/android: Make NativeLibraries.java fields public again.

non-public fields cause issurs across ClassLoaders, which breaks some TriChrome
APKs.

Bug: 1023681
Change-Id: I074c73669cb04ad977e448753ee27b453640cade
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1914393Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715357}

build/android/gyp/native_libraries_template.py

@@ -10,16 +10,16 @@ NATIVE_LIBRARIES_TEMPLATE = """\
 package org.chromium.base.library_loader;
 
 public class NativeLibraries {{
-    static final int CPU_FAMILY_UNKNOWN = 0;
-    static final int CPU_FAMILY_ARM = 1;
-    static final int CPU_FAMILY_MIPS = 2;
-    static final int CPU_FAMILY_X86 = 3;
+    public static final int CPU_FAMILY_UNKNOWN = 0;
+    public static final int CPU_FAMILY_ARM = 1;
+    public static final int CPU_FAMILY_MIPS = 2;
+    public static final int CPU_FAMILY_X86 = 3;
 
     // Set to true to enable the use of the Chromium Linker.
-    static {MAYBE_FINAL}boolean sUseLinker{USE_LINKER};
-    static {MAYBE_FINAL}boolean sUseLibraryInZipFile{USE_LIBRARY_IN_ZIP_FILE};
-    static {MAYBE_FINAL}boolean sEnableLinkerTests{ENABLE_LINKER_TESTS};
-    static {MAYBE_FINAL}boolean sUseModernLinker{USE_MODERN_LINKER};
+    public static {MAYBE_FINAL}boolean sUseLinker{USE_LINKER};
+    public static {MAYBE_FINAL}boolean sUseLibraryInZipFile{USE_LIBRARY_IN_ZIP_FILE};
+    public static {MAYBE_FINAL}boolean sEnableLinkerTests{ENABLE_LINKER_TESTS};
+    public static {MAYBE_FINAL}boolean sUseModernLinker{USE_MODERN_LINKER};
 
     // This is the list of native libraries to be loaded (in the correct order)
     // by LibraryLoader.java.
@@ -30,8 +30,11 @@ public class NativeLibraries {{
     // This is the expected version of the 'main' native library, which is the one that
     // implements the initial set of base JNI functions including
     // base::android::nativeGetVersionName()
-    static {MAYBE_FINAL}String sVersionNumber = {VERSION_NUMBER};
+    // TODO(torne): This is public to work around classloader issues in Trichrome
+    // where NativeLibraries is not in the same dex as LibraryLoader.
+    // We should instead split up Java code along package boundaries.
+    public static {MAYBE_FINAL}String sVersionNumber = {VERSION_NUMBER};
 
-    static {MAYBE_FINAL}int sCpuFamily = {CPU_FAMILY};
+    public static {MAYBE_FINAL}int sCpuFamily = {CPU_FAMILY};
 }}
 """