Android: enable chromium linker on the shells.

base/android/java/src/org/chromium/base/library_loader/Linker.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.os.Bundle;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.os.Parcelable;
@@ skipping 456 matching lines @@
      * Call this to send a Bundle containing the shared RELRO sections to be
      * used in this process. If initServiceProcess() was previously called,
      * finishLibraryLoad() will not exit until this method is called in another
      * thread with a non-null value.
      * @param bundle The Bundle instance containing a map of shared RELRO sections
      * to use in this process.
      */
     public static void useSharedRelros(Bundle bundle) {
         // Ensure the bundle uses the application's class loader, not the framework
         // one which doesn't know anything about LibInfo.
-        if (bundle != null)
+        // Also, hold a fresh copy of it so the caller can't recycle it.
+        Bundle nullOrCopy = null;

[simonb (inactive), 2014/06/16 10:38:38]

Perhaps a more descriptive variable name?  clonedBundle?

[bulach, 2014/06/16 21:54:55]

Done.

+        if (bundle != null) {
+            if (DEBUG) Log.i(TAG, "useSharedRelros() being DE-SER");

[simonb (inactive), 2014/06/16 10:38:38]

Old debugging trace?  Message seems unhelpful without context.

[bulach, 2014/06/16 21:54:55]

ops, my bad. deleted.

             bundle.setClassLoader(LibInfo.class.getClassLoader());
+            nullOrCopy = new Bundle(LibInfo.class.getClassLoader());
+            Parcel p = Parcel.obtain();
+            bundle.writeToParcel(p, 0);
+            nullOrCopy.readFromParcel(p);
+            p.recycle();
+        }
 
-        if (DEBUG) Log.i(TAG, "useSharedRelros() called with " + bundle);
+        if (DEBUG) Log.i(TAG, "useSharedRelros() called with " + nullOrCopy);

[simonb (inactive), 2014/06/16 10:38:38]

No longer strictly accurate.  Perhaps '... setting shared relros to " + ...'?

[bulach, 2014/06/16 21:54:55]

Done.

 
         synchronized (Linker.class) {
             // Note that in certain cases, this can be called before
             // initServiceProcess() in service processes.
-            sSharedRelros = bundle;
+            sSharedRelros = nullOrCopy;
             // Tell any listener blocked in finishLibraryLoad() about it.
             Linker.class.notifyAll();
         }
     }
 
     /**
      * Call this to retrieve the shared RELRO sections created in this process,
      * after loading all libraries.
      * @return a new Bundle instance, or null if RELRO sharing is disabled on
      * this system, or if initServiceProcess() was called previously.
@@ skipping 541 matching lines @@
         }
     }
 
     // The map of libraries that are currently loaded in this process.
     private static HashMap<String, LibInfo> sLoadedLibraries = null;
 
     // Used to pass the shared RELRO Bundle through Binder.
     public static final String EXTRA_LINKER_SHARED_RELROS =
         "org.chromium.base.android.linker.shared_relros";
 }