Index: content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java |
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java |
index c131ff735e6064811f4fbe2f6451a9eff25dafc2..5ed1878c883d7ba13c50f8838194c2aafa6af8fc 100644 |
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java |
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java |
@@ -47,6 +47,8 @@ public class SandboxedProcessService extends Service { |
// Parameters received via IPC, only accessed while holding the mSandboxMainThread monitor. |
private String mNativeLibraryName; // Must be passed in via the bind command. |
private String[] mCommandLineParams; |
+ private int mCpuCount; |
+ private long mCpuFeatures; |
// Pairs IDs and file descriptors that should be registered natively. |
private ArrayList<Integer> mFileIds; |
private ArrayList<ParcelFileDescriptor> mFileFds; |
@@ -69,6 +71,9 @@ public class SandboxedProcessService extends Service { |
} |
// We must have received the command line by now |
assert mCommandLineParams != null; |
+ mCpuCount = args.getInt(SandboxedProcessConnection.EXTRA_CPU_COUNT); |
+ mCpuFeatures = args.getLong(SandboxedProcessConnection.EXTRA_CPU_FEATURES); |
+ assert mCpuCount > 0; |
mFileIds = new ArrayList<Integer>(); |
mFileFds = new ArrayList<ParcelFileDescriptor>(); |
for (int i = 0;; i++) { |
@@ -138,7 +143,8 @@ public class SandboxedProcessService extends Service { |
} |
ContentMain.initApplicationContext(sContext.getApplicationContext()); |
nativeInitSandboxedProcess(sContext.getApplicationContext(), |
- SandboxedProcessService.this, fileIds, fileFds); |
+ SandboxedProcessService.this, fileIds, fileFds, |
+ mCpuCount, mCpuFeatures); |
ContentMain.start(); |
nativeExitSandboxedProcess(); |
} catch (InterruptedException e) { |
@@ -244,7 +250,8 @@ public class SandboxedProcessService extends Service { |
* renderer. |
*/ |
private static native void nativeInitSandboxedProcess(Context applicationContext, |
- SandboxedProcessService service, int[] extraFileIds, int[] extraFileFds); |
+ SandboxedProcessService service, int[] extraFileIds, int[] extraFileFds, |
+ int cpuCount, long cpuFeatures); |
/** |
* Force the sandboxed process to exit. |