Update to Chromium //base at Chromium commit e3a753f17bac62738b0dbf0b36510f767b081e4b.

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

 // Copyright 2015 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.os.Bundle;
 import android.os.Parcel;
 
 import org.chromium.base.Log;
@@ skipping 53 matching lines @@
 
     // The map of libraries that are currently loaded in this process.
     private HashMap<String, LibInfo> mLoadedLibraries = null;
 
     // Private singleton constructor, and singleton factory method.
     private LegacyLinker() {}
     static Linker create() {
         return new LegacyLinker();
     }
 
-    // Used internally to initialize the linker's data. Assume lock is held.
+    // Used internally to initialize the linker's data. Assumes lock is held.
+    // Loads JNI, and sets mMemoryDeviceConfig and mBrowserUsesSharedRelro.
     private void ensureInitializedLocked() {
         assert Thread.holdsLock(mLock);
 
-        if (mInitialized) {
+        if (mInitialized || !NativeLibraries.sUseLinker) {
             return;
         }
 
-        if (NativeLibraries.sUseLinker) {
-            // Load libchromium_android_linker.so.
-            loadLinkerJNILibrary();
+        // On first call, load libchromium_android_linker.so. Cannot be done in the
+        // constructor because instantiation occurs on the UI thread.
+        loadLinkerJniLibrary();
 
-            if (mMemoryDeviceConfig == MEMORY_DEVICE_CONFIG_INIT) {
-                if (SysUtils.isLowEndDevice()) {
-                    mMemoryDeviceConfig = MEMORY_DEVICE_CONFIG_LOW;
+        if (mMemoryDeviceConfig == MEMORY_DEVICE_CONFIG_INIT) {
+            if (SysUtils.isLowEndDevice()) {
+                mMemoryDeviceConfig = MEMORY_DEVICE_CONFIG_LOW;
+            } else {
+                mMemoryDeviceConfig = MEMORY_DEVICE_CONFIG_NORMAL;
+            }
+        }
+
+        // Cannot run in the constructor because SysUtils.isLowEndDevice() relies
+        // on CommandLine, which may not be available at instantiation.
+        switch (BROWSER_SHARED_RELRO_CONFIG) {
+            case BROWSER_SHARED_RELRO_CONFIG_NEVER:
+                mBrowserUsesSharedRelro = false;
+                break;
+            case BROWSER_SHARED_RELRO_CONFIG_LOW_RAM_ONLY:
+                if (mMemoryDeviceConfig == MEMORY_DEVICE_CONFIG_LOW) {
+                    mBrowserUsesSharedRelro = true;
+                    Log.w(TAG, "Low-memory device: shared RELROs used in all processes");
                 } else {
-                    mMemoryDeviceConfig = MEMORY_DEVICE_CONFIG_NORMAL;
+                    mBrowserUsesSharedRelro = false;
                 }
-            }
-
-            switch (BROWSER_SHARED_RELRO_CONFIG) {
-                case BROWSER_SHARED_RELRO_CONFIG_NEVER:
-                    mBrowserUsesSharedRelro = false;
-                    break;
-                case BROWSER_SHARED_RELRO_CONFIG_LOW_RAM_ONLY:
-                    if (mMemoryDeviceConfig == MEMORY_DEVICE_CONFIG_LOW) {
-                        mBrowserUsesSharedRelro = true;
-                        Log.w(TAG, "Low-memory device: shared RELROs used in all processes");
-                    } else {
-                        mBrowserUsesSharedRelro = false;
-                    }
-                    break;
-                case BROWSER_SHARED_RELRO_CONFIG_ALWAYS:
-                    Log.w(TAG, "Beware: shared RELROs used in all processes!");
-                    mBrowserUsesSharedRelro = true;
-                    break;
-                default:
-                    assert false : "Unreached";
-                    break;
-            }
-        } else {
-            if (DEBUG) {
-                Log.i(TAG, "Linker disabled");
-            }
+                break;
+            case BROWSER_SHARED_RELRO_CONFIG_ALWAYS:
+                Log.w(TAG, "Beware: shared RELROs used in all processes!");
+                mBrowserUsesSharedRelro = true;
+                break;
+            default:
+                assert false : "Unreached";
+                break;
         }
 
         mInitialized = true;
     }
 
     /**
-     * Call this method to determine if this chromium project must
-     * use this linker. If not, System.loadLibrary() should be used to load
-     * libraries instead.
-     */
-    @Override
-    public boolean isUsed() {
-        // Only GYP targets that are APKs and have the 'use_chromium_linker' variable
-        // defined as 1 will use this linker. For all others (the default), the
-        // auto-generated NativeLibraries.sUseLinker variable will be false.
-        if (!NativeLibraries.sUseLinker) {
-            return false;
-        }
-
-        synchronized (mLock) {
-            ensureInitializedLocked();
-            return true;
-        }
-    }
-
-    /**
      * Call this method to determine if the linker will try to use shared RELROs
      * for the browser process.
      */
     @Override
     public boolean isUsingBrowserSharedRelros() {
         synchronized (mLock) {
             ensureInitializedLocked();
             return mBrowserUsesSharedRelro;
         }
     }
@@ skipping 26 matching lines @@
     @Override
     public void finishLibraryLoad() {
         if (DEBUG) {
             Log.i(TAG, "finishLibraryLoad() called");
         }
         synchronized (mLock) {
             ensureInitializedLocked();
             if (DEBUG) {
                 Log.i(TAG,
                         String.format(Locale.US,
-                                "mInBrowserProcess=%s mBrowserUsesSharedRelro=%s mWaitForSharedRelros=%s",
-                                mInBrowserProcess ? "true" : "false",
-                                mBrowserUsesSharedRelro ? "true" : "false",
-                                mWaitForSharedRelros ? "true" : "false"));
+                                "mInBrowserProcess=%b mBrowserUsesSharedRelro=%b mWaitForSharedRelros=%b",
+                                mInBrowserProcess, mBrowserUsesSharedRelro, mWaitForSharedRelros));
             }
 
             if (mLoadedLibraries == null) {
                 if (DEBUG) {
                     Log.i(TAG, "No libraries loaded");
                 }
             } else {
                 if (mInBrowserProcess) {
                     // Create new Bundle containing RELRO section information
                     // for all loaded libraries. Make it available to getSharedRelros().
@@ skipping 104 matching lines @@
     /**
      * Call this method before loading any libraries to indicate that this
      * process shall neither create or reuse shared RELRO sections.
      */
     @Override
     public void disableSharedRelros() {
         if (DEBUG) {
             Log.i(TAG, "disableSharedRelros() called");
         }
         synchronized (mLock) {
+            ensureInitializedLocked();
             mInBrowserProcess = false;
             mWaitForSharedRelros = false;
             mBrowserUsesSharedRelro = false;
         }
     }
 
     /**
      * Call this method before loading any libraries to indicate that this
      * process is ready to reuse shared RELRO sections from another one.
      * Typically used when starting service processes.
@@ skipping 106 matching lines @@
             if (!nativeUseSharedRelro(libName, libInfo)) {
                 Log.w(TAG, "Could not use shared RELRO section for " + libName);
             } else {
                 if (DEBUG) {
                     Log.i(TAG, "Using shared RELRO section for " + libName);
                 }
             }
         }
 
         // In service processes, close all file descriptors from the map now.
-        if (!mInBrowserProcess) closeLibInfoMap(relroMap);
+        if (!mInBrowserProcess) {
+            closeLibInfoMap(relroMap);
+        }
 
         if (DEBUG) {
             Log.i(TAG, "Linker.useSharedRelrosLocked() exiting");
         }
     }
 
     /**
      * Implements loading a native shared library with the Chromium linker.
      *
      * Load a native shared library with the Chromium linker. If the zip file
@@ skipping 181 matching lines @@
 
     /**
      * Native method used to use a shared RELRO section.
      *
      * @param library Library name.
      * @param libInfo A LibInfo instance containing valid RELRO information
      * @return true on success.
      */
     private static native boolean nativeUseSharedRelro(String library, LibInfo libInfo);
 }