Android: Add chrome-specific dynamic linker.

content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java

 // Copyright 2012 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.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
 import android.util.Log;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.CpuFeatures;
+import org.chromium.base.Linker;
 import org.chromium.base.SysUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.app.ChildProcessService;
+import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
 import org.chromium.content.common.TraceEvent;
 
 /**
  * Manages a connection between the browser activity and a child service. The class is responsible
  * for estabilishing the connection (start()), closing it (stop()) and increasing the priority of
  * the service when it is in active use (between calls to attachAsActive() and detachAsActive()).
  */
@@ skipping 43 matching lines @@
     public static final String EXTRA_FILES_ID_SUFFIX = "_id";
     public static final String EXTRA_FILES_FD_SUFFIX = "_fd";
 
     // Used to pass the CPU core count to child processes.
     public static final String EXTRA_CPU_COUNT =
             "com.google.android.apps.chrome.extra.cpu_count";
     // Used to pass the CPU features mask to child processes.
     public static final String EXTRA_CPU_FEATURES =
             "com.google.android.apps.chrome.extra.cpu_features";
 
+    public static final String EXTRA_LINKER_BASE_LOAD_ADDRESS =
+            "com.google.android.apps.chrome.extra.linker_base_load_address";
+
     private final Context mContext;
     private final int mServiceNumber;
     private final boolean mInSandbox;
     private final ChildProcessConnection.DeathCallback mDeathCallback;
     private final Class<? extends ChildProcessService> mServiceClass;
 
     // Synchronization: While most internal flow occurs on the UI thread, the public API
     // (specifically start and stop) may be called from any thread, hence all entry point methods
     // into the class are synchronized on the lock to protect access to these members. But see also
     // the TODO where AsyncBoundServiceConnection is created.
@@ skipping 53 matching lines @@
             mBindFlags = bindFlags;
             mProtectsFromOom = protectsFromOom;
         }
 
         boolean bind(String[] commandLine) {
             if (!mBound) {
                 final Intent intent = createServiceBindIntent();
                 if (commandLine != null) {
                     intent.putExtra(EXTRA_COMMAND_LINE, commandLine);
                 }
+                if (LibraryLoader.useCrazyLinker()) {
+                    intent.putExtra(EXTRA_LINKER_BASE_LOAD_ADDRESS, Linker.getBaseLoadAddress());
+                }
                 mBound = mContext.bindService(intent, this, mBindFlags);
                 if (mBound && mProtectsFromOom && mConnectionCallbacks != null) {
                     mConnectionCallbacks.onOomBindingAdded(getPid());
                 }
             }
             return mBound;
         }
 
         void unbind() {
             if (mBound) {
@@ skipping 233 matching lines @@
 
         if (mConnectionCallbacks != null) {
             // Number of out-of-memory bindings bound before the connection was set up.
             int oomBindingCount =
                     (mInitialBinding.isBound() ? 1 : 0) + (mStrongBinding.isBound() ? 1 : 0);
             mConnectionCallbacks.onConnected(getPid(), oomBindingCount);
         }
         TraceEvent.end();
     }
 
+    public void applyRelro(Bundle relroBundle) {
+        if (mService != null && relroBundle != null)
+            try {
+                mService.applyRelro(relroBundle);
+            } catch (RemoteException e) {
+                // Nothing to do if the child process died.
+            }
+    }
+
     private static final long REMOVE_INITIAL_BINDING_DELAY_MILLIS = 1 * 1000;  // One second.
 
     /**
      * Called to remove the strong binding estabilished when the connection was started. It is safe
      * to call this multiple times. The binding is removed after a fixed delay period so that the
      * renderer will not be killed immediately after the call.
      */
     void removeInitialBinding() {
         synchronized(mLock) {
             if (!mInitialBinding.isBound()) {
@@ skipping 60 matching lines @@
 
     /**
      * @return The connection PID, or 0 if not yet connected.
      */
     int getPid() {
         synchronized(mLock) {
             return mPID;
         }
     }
 }