Add UMA for testing whether the Chromium library was page aligned in the APK file.

base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base.library_loader;
 
 import android.content.Context;
 import android.os.SystemClock;
 import android.util.Log;
 
@@ skipping 36 matching lines @@
 
     // One-way switches recording attempts to use Relro sharing in the browser.
     // The flags are used to report UMA stats later.
     private static boolean sIsUsingBrowserSharedRelros = false;
     private static boolean sLoadAtFixedAddressFailed = false;
 
     // One-way switch becomes true if the library was loaded from the APK file
     // directly.
     private static boolean sLibraryWasLoadedFromApk = false;
 
+    // One-way switch becomes false if the library was not aligned in the APK
+    // file.

[rmcilroy, 2014/10/28 13:07:15]

if Linker.isInZipFile. 

[petrcermak, 2014/10/28 13:48:15]

Done.

+    private static boolean sLibraryWasAlignedInApk = true;
+
     // One-way switch becomes true if the system library loading failed,
     // and the right native library was found and loaded by the hack.
     // The flag is used to report UMA stats later.
     private static boolean sNativeLibraryHackWasUsed = false;
 
     /**
      * The same as ensureInitialized(null, false), should only be called
      * by non-browser processes.
      *
      * @throws ProcessInitException
@@ skipping 91 matching lines @@
                 assert !sInitialized;
 
                 long startTime = SystemClock.uptimeMillis();
                 boolean useChromiumLinker = Linker.isUsed();
 
                 if (useChromiumLinker) {
                     // Load libraries using the Chromium linker.
                     Linker.prepareLibraryLoad();
 
                     for (String library : NativeLibraries.LIBRARIES) {
+                        // Don't self-load the linker. This is because the build system is
+                        // not clever enough to understand that all the libraries packaged
+                        // in the final .apk don't need to be explicitly loaded.
+                        if (Linker.isLinkerLibrary(library)) {
+                            if (Linker.DEBUG) Log.i(TAG, "ignoring self-linker load");

[rmcilroy, 2014/10/28 13:07:15]

Don't use Linker.DEBUG here - have a seperate one for LibraryLoader if you need
it.

[petrcermak, 2014/10/28 13:48:15]

Done (added a separate one).

+                            continue;
+                        }
+
                         String zipfile = null;
                         if (Linker.isInZipFile()) {
                             zipfile = context.getApplicationInfo().sourceDir;
+                            sLibraryWasAlignedInApk = Linker.checkLibraryAlignedInApk(
+                                    zipfile, System.mapLibraryName(library));
                             Log.i(TAG, "Loading " + library + " from within " + zipfile);
                         } else {
                             Log.i(TAG, "Loading: " + library);
                         }
 
                         boolean isLoaded = false;
                         if (Linker.isUsingBrowserSharedRelros()) {
                             sIsUsingBrowserSharedRelros = true;
                             try {
                                 if (zipfile != null) {
@@ skipping 138 matching lines @@
 
     // Returns the device's status for loading a library directly from the APK file.
     // This method can only be called when the Chromium linker is used.
     private static int getLibraryLoadFromApkStatus(Context context) {
         assert Linker.isUsed();
 
         if (sLibraryWasLoadedFromApk) {
             return LibraryLoadFromApkStatusCodes.SUCCESSFUL;
         }
 
+        if (!sLibraryWasAlignedInApk) {
+            return LibraryLoadFromApkStatusCodes.NOT_ALIGNED;
+        }
+
         if (context == null) {
             Log.w(TAG, "Unknown APK filename due to null context");
             return LibraryLoadFromApkStatusCodes.UNKNOWN;
         }
 
         return Linker.checkLibraryLoadFromApkSupport(context.getApplicationInfo().sourceDir) ?
                 LibraryLoadFromApkStatusCodes.SUPPORTED :
                 LibraryLoadFromApkStatusCodes.NOT_SUPPORTED;
     }
 
@@ skipping 34 matching lines @@
     private static native void nativeRegisterChromiumAndroidLinkerRendererHistogram(
             boolean requestedSharedRelro,
             boolean loadAtFixedAddressFailed);
 
     // Get the version of the native library. This is needed so that we can check we
     // have the right version before initializing the (rest of the) JNI.
     private static native String nativeGetVersionNumber();
 
     private static native void nativeRecordNativeLibraryHack(boolean usedHack);
 }