Files required by a service now listed in manifest.

content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

 // Copyright 2016 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.app;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.SurfaceTexture;
 import android.os.Binder;
@@ skipping 242 matching lines @@
                             .registerRendererProcessHistogram(requestedSharedRelro,
                                     loadAtFixedAddressFailed);
                     LibraryLoader.get(mLibraryProcessType).initialize();
                     synchronized (mMainThread) {
                         mLibraryInitialized = true;
                         mMainThread.notifyAll();
                         while (mFdInfos == null) {
                             mMainThread.wait();
                         }
                     }
+
+                    String sharedFilesValue = CommandLine.getInstance().getSwitchValue(
+                            ContentSwitches.SHARED_FILES, null);
+                    long storeRegistrationContext =
+                            nativeCreateFileDescriptorStoreRegistrationContext(sharedFilesValue);
                     for (FileDescriptorInfo fdInfo : mFdInfos) {
-                        nativeRegisterGlobalFileDescriptor(
-                                fdInfo.mId, fdInfo.mFd.detachFd(), fdInfo.mOffset, fdInfo.mSize);
+                        // For now we support the FileDescriptorStore (which passes string keys for
+                        // FDs through the command line) and the GlobalFileDescriptor (which uses
+                        // int keys).
+                        int fd = fdInfo.mFd.detachFd();
+                        if (storeRegistrationContext == 0
+                                || !nativeRegisterInFileDescriptorStore(storeRegistrationContext,
+                                           fdInfo.mId, fd, fdInfo.mOffset, fdInfo.mSize)) {
+                            nativeRegisterGlobalFileDescriptor(

[boliu, 2017/02/09 23:59:55]

that's a lot of jni calls

just put these things into parallel vectors, and send them all down to native in
a single call?

Actually, why not just do all of this in native code, since native code has
access to command line as well?

[Jay Civelli, 2017/02/10 06:32:34]

Merged it all in one JNI call.

+                                    fdInfo.mId, fd, fdInfo.mOffset, fdInfo.mSize);
+                        }
                     }
+                    nativeReleaseFileDescriptorStoreRegistrationContext(storeRegistrationContext);
                     nativeInitChildProcessImpl(ChildProcessServiceImpl.this, mCpuCount,
                             mCpuFeatures);
                     if (mActivitySemaphore.tryAcquire()) {
                         ContentMain.start();
                         nativeExitChildProcess();
                     }
                 } catch (InterruptedException e) {
                     Log.w(TAG, "%s startup failed: %s", MAIN_THREAD_NAME, e);
                 } catch (ProcessInitException e) {
                     Log.w(TAG, "%s startup failed: %s", MAIN_THREAD_NAME, e);
@@ skipping 117 matching lines @@
         try {
             SurfaceWrapper wrapper = mCallback.getViewSurface(surfaceId);
             return wrapper != null ? wrapper.getSurface() : null;
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to call getViewSurface: %s", e);
             return null;
         }
     }
 
     /**
+     * Creates/releases a context needed by nativeRegisterInFileDescriptorStore.
+     */
+    private static native long nativeCreateFileDescriptorStoreRegistrationContext(
+            String sharedFileSwitchValue);
+    private static native void nativeReleaseFileDescriptorStoreRegistrationContext(long context);
+
+    /**
+     * Helper for registering FileDescriptorInfo objects with FileDescriptorStore.
+     * Returns true if the file was registered (if it was found in the command line).
+     */
+    private static native boolean nativeRegisterInFileDescriptorStore(
+            long context, int id, int fd, long offset, long size);
+
+    /**
      * Helper for registering FileDescriptorInfo objects with GlobalFileDescriptors.
      * This includes the IPC channel, the crash dump signals and resource related
      * files.
      */
     private static native void nativeRegisterGlobalFileDescriptor(
             int id, int fd, long offset, long size);
 
     /**
      * The main entry point for a child process. This should be called from a new thread since
      * it will not return until the child process exits. See child_process_service.{h,cc}
      *
      * @param serviceImpl The current ChildProcessServiceImpl object.
      * renderer.
      */
     private static native void nativeInitChildProcessImpl(
             ChildProcessServiceImpl serviceImpl, int cpuCount, long cpuFeatures);
 
     /**
      * Force the child process to exit.
      */
     private static native void nativeExitChildProcess();
 
     private native void nativeShutdownMainThread();
 }